]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 83ccb61) | patch
vpatch: highlight conflicts better.
authorNeilBrown <neilb@suse.de>
Wed, 14 Nov 2012 23:17:38 +0000 (10:17 +1100)
committerNeilBrown <neilb@suse.de>
Wed, 14 Nov 2012 23:18:39 +0000 (10:18 +1100)
commit1b306d76048943a36dbcc1fd399aba2feb13ebfc
tree7d97b751e8873e1c10334c9705177e7822eb33c4tree | snapshot
parent83ccb6192031a3fb4bec84611c53ced83a1a27adcommit | diff
vpatch: highlight conflicts better.

You can only tell the difference between a conflict and a
change by the conflict starting with '|', not '-'.
So make that '|' more visible, because conflicts are important.

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