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