diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/merge-2-identical | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/merge-2-identical b/t/merge-2-identical new file mode 100755 index 0000000..eafc4d1 --- /dev/null +++ b/t/merge-2-identical @@ -0,0 +1,15 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + same \ + "${TAIL}" \ + same \ + "${END} theirs" + +cp -- file file.expected + +conflict --merge --no-reduce file + +also_interactive m |