]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a9c6001) | patch
Browser: fix in_conflict detection while browsing.
authorNeilBrown <neilb@suse.de>
Tue, 15 May 2012 09:31:47 +0000 (19:31 +1000)
committerNeilBrown <neilb@suse.de>
Tue, 15 May 2012 09:31:47 +0000 (19:31 +1000)
commit0da9cb2c412ad27802788bdb5e23854f2478dbe6
tree6c30f3444b1603eef1fa806fc5a4e78f1135ff26tree | snapshot
parenta9c60014ae9405aacce4256a903a279797fe4932commit | diff
Browser: fix in_conflict detection while browsing.

I forget to consider 'hi' and 'lo'.

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