1 files changed, 18 insertions, 0 deletions
diff --git a/t/merge-short-option b/t/merge-short-option
new file mode 100755
index 0000000..3a68ee0
--- /dev/null
+++ b/t/merge-short-option
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+	"${HEAD} ours" \
+	same \
+	"${PARENT} base" \
+	same \
+	"${TAIL}" \
+	different \
+	"${END} theirs"
+
+printf '%s\n' > file.expected \
+	different
+
+normal -m --no-reduce file
+
+also_interactive s