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