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