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