]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a1ddba0) | patch
vpatch: simplify display of editted mergers.
authorNeilBrown <neilb@suse.de>
Wed, 21 Aug 2013 00:19:30 +0000 (10:19 +1000)
committerNeilBrown <neilb@suse.de>
Wed, 21 Aug 2013 00:19:30 +0000 (10:19 +1000)
commit9426150e58f43bba3657b411c815811ccdd861bf
tree4148a8b746b86c26d9de6dd0a2695df7ecf7194ctree | snapshot
parenta1ddba04756f62aefde5bf6521285f26f10ae669commit | diff
vpatch: simplify display of editted mergers.

Rather than having some special cases, simply use the original 'type'
unless RESULT is requested.  In that case use the new 'type'.

This is much more general and seems to work OK.

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