aboutsummaryrefslogtreecommitdiffstats
path: root/t/combination-remove-base-select-head-reduce
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xt/combination-remove-base-select-head-reduce18
1 files changed, 18 insertions, 0 deletions
diff --git a/t/combination-remove-base-select-head-reduce b/t/combination-remove-base-select-head-reduce
new file mode 100755
index 0000000..96e828d
--- /dev/null
+++ b/t/combination-remove-base-select-head-reduce
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+ "${HEAD} ours" \
+ ours \
+ "${PARENT} base" \
+ base \
+ "${TAIL}" \
+ theirs \
+ "${END} theirs"
+
+printf '%s\n' > file.expected \
+ ours
+
+normal --remove-base --select-head --reduce file
+
+also_interactive h