]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f2aba8f) | patch
merge: avoid including large Unmatched sections in a conflict.
authorNeil Brown <neilb@suse.de>
Tue, 8 May 2012 09:56:38 +0000 (19:56 +1000)
committerNeil Brown <neilb@suse.de>
Tue, 8 May 2012 09:56:38 +0000 (19:56 +1000)
commitcff4183fa585a1693293936e7f1035012fc0b4b0
tree5bea65931642a2cf0f1dfcbf0bf6f320876442aatree | snapshot
parentf2aba8f729258265efea8636fc762ff9d09adf77commit | diff
merge: avoid including large Unmatched sections in a conflict.

A large Unmatched section can just distract from the real conflict
and doesn't give useful information.
So if we can close the conflict before a big Unmatched,
do so.

Signed-off-by: NeilBrown <neilb@suse.de>
merge2.c diff | blob | history
tests/linux/md-resync/merge diff | blob | history
apply rejected patches and perform word-wise diffs