]> git.neil.brown.name Git - wiggle.git/commit
git / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e85c5ea) | patch
Add --show-wiggle flag.
authorNeil Brown <neilb@suse.de>
Mon, 7 May 2012 21:59:27 +0000 (07:59 +1000)
committerNeil Brown <neilb@suse.de>
Mon, 7 May 2012 21:59:27 +0000 (07:59 +1000)
commitacac69914562efd8cf1b43427c6bb05727384d87
tree5bb626bed5acd06a829aadba1b0d02d39a23fff1tree | snapshot
parente85c5eae170d22208cc19b758178c6cd25f32e0ccommit | diff
Add --show-wiggle flag.

--show-wiggle modifies --merge so that chunks which need to be
wiggled into place are presented as full conflicts with an
extra stanza which shows what the resulting wiggle would look like.

Suggested-by: Alessandro Salvatori <sandr8@gmail.com>
Signed-off-by: NeilBrown <neilb@suse.de>
16 files changed:
ReadMe.c diff | blob | history
TODO diff | blob | history
dotest diff | blob | history
merge2.c diff | blob | history
tests/simple/show-wiggle-1/Wmerge [new file with mode: 0644] blob
tests/simple/show-wiggle-1/new [new file with mode: 0644] blob
tests/simple/show-wiggle-1/new2 [new file with mode: 0644] blob
tests/simple/show-wiggle-1/orig [new file with mode: 0644] blob
tests/simple/show-wiggle-2/Wmerge [new file with mode: 0644] blob
tests/simple/show-wiggle-2/new [new file with mode: 0644] blob
tests/simple/show-wiggle-2/new2 [new file with mode: 0644] blob
tests/simple/show-wiggle-2/orig [new file with mode: 0644] blob
vpatch.c diff | blob | history
wiggle.1 diff | blob | history
wiggle.c diff | blob | history
wiggle.h diff | blob | history
apply rejected patches and perform word-wise diffs