]> git.neil.brown.name Git - wiggle.git/commit
git / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a4a492d) | patch
tests: new test case for stray &&&&&
authorNeilBrown <neilb@suse.de>
Mon, 19 Aug 2013 05:00:50 +0000 (15:00 +1000)
committerNeilBrown <neilb@suse.de>
Mon, 19 Aug 2013 05:00:50 +0000 (15:00 +1000)
commit02320c64852f82695d1b281fd4147a8f20bc712a
treeb46818d8758ae7655cbdbccc69468407530eed3etree | snapshot
parenta4a492d78a96a1e33258beeaebbac2b48fb734ffcommit | diff
tests: new test case for stray &&&&&

We sometime get stray empty conflicts, particularly with &&&&&&
even though show-wiggles wasn't requested.

Signed-off-by: NeilBrown <neilb@suse.de>
tests/linux/raid10-race/merge [new file with mode: 0644] blob
tests/linux/raid10-race/orig [new file with mode: 0644] blob
tests/linux/raid10-race/patch [new file with mode: 0644] blob
apply rejected patches and perform word-wise diffs