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