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