| commit | b56cce2326fb5a5bd0d98a3932e041802a8d6e4a | |
| author | NeilBrown <neilb@suse.de> | |
| Mon, 19 Aug 2013 05:03:37 +0000 (19 15:03 +1000) | ||
| committer | NeilBrown <neilb@suse.de> | |
| Mon, 19 Aug 2013 05:03:37 +0000 (19 15:03 +1000) | ||
| tree | 7d0027464d38ccaaba171c4445e1047a90572d4a | treesnapshot (tar.gz zip) |
| parent | 02320c64852f82695d1b281fd4147a8f20bc712a | commitdiff |
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>
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 | diffblobblamehistory |