]> git.neil.brown.name Git - wiggle.git/commit
projects / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3871e4c) | patch
vpatch: update display correctly when editing the merge.
authorNeilBrown <neilb@suse.de>
Wed, 14 Nov 2012 23:07:19 +0000 (10:07 +1100)
committerNeilBrown <neilb@suse.de>
Wed, 14 Nov 2012 23:18:39 +0000 (10:18 +1100)
commit83ccb6192031a3fb4bec84611c53ced83a1a27ad
tree9f41b29df3e1c4f5e82edbf89f6eae4f13b882detree | snapshot
parent3871e4c6cfd431cec53e4d0fc81688059d6ff725commit | diff
vpatch: update display correctly when editing the merge.

If an edit changes the merge so that we don't need to show
two separate streams any more, then the display must be updated
to not show the stream.
And the reverse.

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