aboutsummaryrefslogtreecommitdiffstats
path: root/t/no-reduce-4-head
diff options
context:
space:
mode:
Diffstat (limited to 't/no-reduce-4-head')
-rwxr-xr-xt/no-reduce-4-head31
1 files changed, 31 insertions, 0 deletions
diff --git a/t/no-reduce-4-head b/t/no-reduce-4-head
new file mode 100755
index 0000000..68425c6
--- /dev/null
+++ b/t/no-reduce-4-head
@@ -0,0 +1,31 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+ "${HEAD} 1" \
+ head-common-first \
+ head-common-second \
+ branch-1-first \
+ branch-1-second \
+ "${PARENT} 2" \
+ head-common-first \
+ head-common-second \
+ branch-2-first \
+ branch-2-second \
+ "${PARENT} 3" \
+ head-common-first \
+ head-common-second \
+ branch-3-first \
+ branch-3-second \
+ "${TAIL} 4" \
+ head-common-first \
+ head-common-second \
+ branch-4-first \
+ branch-4-second \
+ "${END} 4"
+
+cp -- file file.expected
+
+conflict --no-reduce file
+
+also_interactive s