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