aboutsummaryrefslogtreecommitdiffstats
path: root/t/no-option-select-head-no-yes
diff options
context:
space:
mode:
Diffstat (limited to 't/no-option-select-head-no-yes')
-rwxr-xr-xt/no-option-select-head-no-yes18
1 files changed, 18 insertions, 0 deletions
diff --git a/t/no-option-select-head-no-yes b/t/no-option-select-head-no-yes
new file mode 100755
index 0000000..1496892
--- /dev/null
+++ b/t/no-option-select-head-no-yes
@@ -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 --no-select-head --select-head --no-reduce file
+
+also_interactive h