]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 21bdfc3) | patch
Browser: improve rendering of conflicts in the the 'merge' view.
authorNeil Brown <neilb@suse.de>
Fri, 11 May 2012 09:30:22 +0000 (19:30 +1000)
committerNeil Brown <neilb@suse.de>
Fri, 11 May 2012 09:30:22 +0000 (19:30 +1000)
commit34a8badaf23fd53baeb6805f4d26c14f1a95293b
treed252d17571cd274562aef8241b79848335ef7583tree | snapshot
parent21bdfc377c19d357600986ccc9d0b1eabf84fb4dcommit | diff
Browser: improve rendering of conflicts in the the 'merge' view.

I was ignoring the in_conflict value, so the 'original' side
of a conflict wasn't properly displayed, and so looked confusing.

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