Tree
- Tree:
1cd5bcf04de744cb7966d8914c4c48159a1d2ca9
- Date:
- Message:
- add ci/he/mg/rb -C option to commit unresolved conflicts As per stsp's suggestion and building on his initial diff, add the -C option to enable creating commits with unresolved conflicts to the commit, histedit, merge, and rebase commands to allow continuing the operation despite files in conflict status. Also, only search for conflict markers in newly added lines to enable working with files already under version control that may have conflict markers embedded verbatim. lots of tweaks, improvements, and initial diff + ok stsp@
Makefile | commits | blame |
got-read-blob.c | commits | blame |