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