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