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