1 files changed, 17 insertions, 0 deletions
diff --git a/t/merge-base b/t/merge-base
new file mode 100755
index 0000000..8b7969e
--- /dev/null
+++ b/t/merge-base
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+	"${HEAD} a" \
+	same \
+	"${PARENT} b" \
+	different \
+	"${TAIL}" \
+	same \
+	"${END} c"
+
+cp -- file file.expected
+
+conflict --merge --no-reduce file
+
+also_interactive m