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