aboutsummaryrefslogtreecommitdiffstats
path: root/t/no-reduce-5-middle
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xt/no-reduce-5-middle46
1 files changed, 46 insertions, 0 deletions
diff --git a/t/no-reduce-5-middle b/t/no-reduce-5-middle
new file mode 100755
index 0000000..3826bc6
--- /dev/null
+++ b/t/no-reduce-5-middle
@@ -0,0 +1,46 @@
+#!/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 \
+ "${PARENT} 4" \
+ branch-4-before-first \
+ branch-4-before-second \
+ middle-common-first \
+ middle-common-second \
+ branch-4-after-first \
+ branch-4-after-second \
+ "${TAIL} 5" \
+ branch-5-before-first \
+ branch-5-before-second \
+ middle-common-first \
+ middle-common-second \
+ branch-5-after-first \
+ branch-5-after-second \
+ "${END} 5"
+
+cp -- file file.expected
+
+conflict --no-reduce file
+
+also_interactive s