]> git.neil.brown.name Git - wiggle.git/commit
git / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7fae298) | patch
Add some test after the markers in a merge.
authorNeilBrown <neilb@suse.de>
Mon, 19 Aug 2013 23:55:23 +0000 (09:55 +1000)
committerNeilBrown <neilb@suse.de>
Mon, 19 Aug 2013 23:55:23 +0000 (09:55 +1000)
commit552c1e49de4fba5aac97cabcc7f6b0760e081982
treee03d11f105a1b518a9a7cc8f657c04d87f360747tree | snapshot
parent7fae2985a32966da4fadde6a42669cd5364063d9commit | diff
Add some test after the markers in a merge.

"git rerere" likes to see a space after the "<<<<<<<" and
">>>>>>>".  So put it there and add a vaguely relevant word too.

Signed-off-by: NeilBrown <neilb@suse.de>
30 files changed:
merge2.c diff | blob | history
tests/linux/idmap.h/merge diff | blob | history
tests/linux/inode-fullpatch/merge diff | blob | history
tests/linux/inode-justrej/lmerge diff | blob | history
tests/linux/inode-justrej/merge diff | blob | history
tests/linux/iomap/merge diff | blob | history
tests/linux/md-autostart/merge diff | blob | history
tests/linux/md-loop/merge diff | blob | history
tests/linux/md-loop/orig diff | blob | history
tests/linux/md-resync/merge diff | blob | history
tests/linux/raid1-A/merge diff | blob | history
tests/linux/raid10-race/merge diff | blob | history
tests/linux/raid5/merge diff | blob | history
tests/linux/raid5build/merge diff | blob | history
tests/linux/raid5line/lmerge diff | blob | history
tests/linux/raid5line/merge diff | blob | history
tests/linux/rpc_tcp_nonagle/merge diff | blob | history
tests/simple/all-different-2/lmerge diff | blob | history
tests/simple/all-different-2/merge diff | blob | history
tests/simple/all-different/lmerge diff | blob | history
tests/simple/all-different/merge diff | blob | history
tests/simple/conflict/merge diff | blob | history
tests/simple/conflictmixed/lmerge diff | blob | history
tests/simple/conflictmixed/merge diff | blob | history
tests/simple/multiple-add/lmerge diff | blob | history
tests/simple/multiple-add/merge diff | blob | history
tests/simple/show-wiggle-1/Wmerge diff | blob | history
tests/simple/show-wiggle-2/Wmerge diff | blob | history
tests/simple/show-wiggle-3/Wmerge diff | blob | history
tests/simple/trivial-conflict/merge diff | blob | history
apply rejected patches and perform word-wise diffs