]> git.neil.brown.name Git - wiggle.git/commit
git / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 97f2558) | patch
Browser: add 'c' command to accept a conflict.
authorNeilBrown <neilb@suse.de>
Tue, 20 Aug 2013 23:35:01 +0000 (09:35 +1000)
committerNeilBrown <neilb@suse.de>
Tue, 20 Aug 2013 23:35:01 +0000 (09:35 +1000)
commita1ddba04756f62aefde5bf6521285f26f10ae669
tree4df4a47e2e2988ec8a54dd302416b32d44d97be8tree | snapshot
parent97f2558129ab118fadce95b45a93b7f63a2cbcbdcommit | diff
Browser: add 'c' command to accept a conflict.

'c' will change a 'Conflict' to 'Changed' so we keep the result
even though the 'before' part doesn't match.

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