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