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