Tree
- Tree:
4a1fd7e9ebde6a3686db9fba3151633c6a845d75
- Date:
- Message:
- use Patience diff for merging during cherrypick/backout/histedit/rebase This has been shown to prevent mis-merges in some cases. It's probably not a final solution. We should look at what Git's "recursive merge" is doing and implement something similar. Keep using Myers during update/unstage. The advantage of Myers is that it produces smaller conflict chunks, and there are no known cases of mis-merges which affect update/unstage.
Makefile | commits | blame |
Makefile.inc | commits | blame |
files/ | |
gotweb.8 | commits | blame |
gotweb.c | commits | blame |
gotweb.conf.5 | commits | blame |
gotweb.h | commits | blame |
libexec/ | |
parse.y | commits | blame |