]> git.neil.brown.name Git - wiggle.git/commit
git / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7ba2094) | patch
vpatch: prompt to save change if merge was editted.
authorNeilBrown <neilb@suse.de>
Wed, 14 Nov 2012 05:05:27 +0000 (16:05 +1100)
committerNeilBrown <neilb@suse.de>
Wed, 14 Nov 2012 05:05:27 +0000 (16:05 +1100)
commit2e0413bda650089facac3c59a07dd435343ae026
tree7df28d9de8947554b96a37bb3274aeec99d7d45ctree | snapshot
parent7ba20946dab0df437febe637638556884d67e542commit | diff
vpatch: prompt to save change if merge was editted.

Not much editting is possible yet, but if it is done, we might
want to save, or discard, or continue editing.

The 'help' window is retasked to alternatively be a 'query' window.

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