diff options
Diffstat (limited to 't/reduce-2-middle')
| -rwxr-xr-x | t/reduce-2-middle | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/t/reduce-2-middle b/t/reduce-2-middle new file mode 100755 index 0000000..f2ab8d3 --- /dev/null +++ b/t/reduce-2-middle @@ -0,0 +1,41 @@ +#!/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 \ + "${TAIL} 2" \ + branch-2-before-first \ + branch-2-before-second \ + middle-common-first \ + middle-common-second \ + branch-2-after-first \ + branch-2-after-second \ + "${END} 2" + +printf '%s\n' > file.expected \ + "${HEAD} 1" \ + branch-1-before-first \ + branch-1-before-second \ + "${TAIL} 2" \ + branch-2-before-first \ + branch-2-before-second \ + "${END} 2" \ + middle-common-first \ + middle-common-second \ + "${HEAD} 1" \ + branch-1-after-first \ + branch-1-after-second \ + "${TAIL} 2" \ + branch-2-after-first \ + branch-2-after-second \ + "${END} 2" + +conflict --reduce file + +also_interactive rrr |