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