]> git.neil.brown.name Git - wiggle.git/commit
git / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 408641b) | patch
Browser: if editing leaves no conflicts, display diff.
authorNeilBrown <neilb@suse.de>
Thu, 22 Aug 2013 03:44:47 +0000 (13:44 +1000)
committerNeilBrown <neilb@suse.de>
Thu, 22 Aug 2013 03:44:47 +0000 (13:44 +1000)
commitd22ae78f38b9194521487ef8264ea9bc9a8b4ac7
tree4a5804a5a3ee99fe9935f930a3be2e64e58bc2e7tree | snapshot
parent408641bb1dd6b0e17fe453ea208dcd3145d85937commit | diff
Browser: if editing leaves no conflicts, display diff.

This isn't completely consistent behaviour, but it seems useful
for now.

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