]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dae1411) | patch
vpatch: allow mode setting keys to toggle back to 'merge'.
authorNeilBrown <neilb@suse.de>
Wed, 14 Nov 2012 23:59:04 +0000 (10:59 +1100)
committerNeilBrown <neilb@suse.de>
Wed, 14 Nov 2012 23:59:04 +0000 (10:59 +1100)
commitaaa5c1896f44232e28ce2ad5fd287772ec5e8f8d
tree385337d986d1105054f96266ed84572a7ab50c49tree | snapshot
parentdae141103811bd19e69dc4600758c993a05ca69dcommit | diff
vpatch: allow mode setting keys to toggle back to 'merge'.

When I set the mode to anything other than 'merge', I usually want to
then go straight back to 'merge'.  And if someone does it by mistake,
a toggle function is easier to guess.

So make all mode setting commands toggle between their mode, and
'merge'.

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