]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1655dcd) | patch
vpatch: revise the exact meaning of 'CHANGES'.
authorNeilBrown <neilb@suse.de>
Mon, 12 Nov 2012 23:33:40 +0000 (10:33 +1100)
committerNeilBrown <neilb@suse.de>
Mon, 12 Nov 2012 23:33:40 +0000 (10:33 +1100)
commit3c68b8bba6450deab642f10f3fedd76246ee2957
tree4e0040b2af3694d45ad318799b2dc07c4635a442tree | snapshot
parent1655dcd108b24380c19069e529a1654383870282commit | diff
vpatch: revise the exact meaning of 'CHANGES'.

The 'CHANGES' flag now means that a change is visible at this point
in the merge.  i.e. two streams need to be displayed instead of just one.

In particular, this means that an AlreadyApplied line removal will not
appear at all in the 'merge' window, but will trigger the 'diff' subwindow
to be displayed.

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