]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 02320c6) | patch
merge: fix reporting of empty "conflicts".
authorNeilBrown <neilb@suse.de>
Mon, 19 Aug 2013 05:03:37 +0000 (15:03 +1000)
committerNeilBrown <neilb@suse.de>
Mon, 19 Aug 2013 05:03:37 +0000 (15:03 +1000)
commitb56cce2326fb5a5bd0d98a3932e041802a8d6e4a
tree7d0027464d38ccaaba171c4445e1047a90572d4atree | snapshot
parent02320c64852f82695d1b281fd4147a8f20bc712acommit | diff
merge: fix reporting of empty "conflicts".

The important part of this patch is the end in print_merge().
If one conflict follows another with nothing in between,
then we really should try to mark up that 'nothingness' as
a resolved conflict.

The other parts as just cleaning up isolate_conflicts a bit more
as I tried to figure out what was happening.

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