]> git.neil.brown.name Git - wiggle.git/commit
git / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 820127e) | patch
vpatch: fix display for ignored conflicts.
authorNeilBrown <neilb@suse.de>
Thu, 15 Nov 2012 01:23:59 +0000 (12:23 +1100)
committerNeilBrown <neilb@suse.de>
Thu, 15 Nov 2012 01:23:59 +0000 (12:23 +1100)
commit6e11b2cda194c0e5679cbfa25276aac213b0b3e7
treef7c1817a77a52748487360e4e3adba87c4e3a138tree | snapshot
parent820127eaf8426f3d32c0d87405df37f685b27ffdcommit | diff
vpatch: fix display for ignored conflicts.

We need to make sure we display the 'before' bit, not just
hide the 'after' bit.

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