3 files changed, 74 insertions, 0 deletions
diff --git a/t/no-option-remove-base b/t/no-option-remove-base
new file mode 100755
index 0000000..fbb8385
--- /dev/null
+++ b/t/no-option-remove-base
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+	"${HEAD} ours" \
+	same \
+	ours \
+	"${PARENT} base" \
+	same \
+	base \
+	"${TAIL}" \
+	same \
+	theirs \
+	"${END} theirs"
+
+printf '%s\n' > file.expected \
+	same \
+	"${HEAD} ours" \
+	ours \
+	"${PARENT} base" \
+	base \
+	"${TAIL}" \
+	theirs \
+	"${END} theirs"
+
+conflict --no-remove-base file
+
+also_interactive rr
diff --git a/t/no-option-remove-base-no-yes b/t/no-option-remove-base-no-yes
new file mode 100755
index 0000000..9f6fed8
--- /dev/null
+++ b/t/no-option-remove-base-no-yes
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+	"${HEAD} ours" \
+	ours \
+	"${PARENT} base" \
+	base \
+	"${TAIL}" \
+	theirs \
+	"${END} theirs"
+
+printf '%s\n' > file.expected \
+	"${HEAD} ours" \
+	ours \
+	"${TAIL}" \
+	theirs \
+	"${END} theirs"
+
+conflict --no-remove-base --remove-base --no-reduce file
+
+also_interactive bb
diff --git a/t/no-option-remove-base-yes-no b/t/no-option-remove-base-yes-no
new file mode 100755
index 0000000..e93b8ee
--- /dev/null
+++ b/t/no-option-remove-base-yes-no
@@ -0,0 +1,24 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+	"${HEAD} ours" \
+	ours \
+	"${PARENT} base" \
+	base \
+	"${TAIL}" \
+	theirs \
+	"${END} theirs"
+
+printf '%s\n' > file.expected \
+	"${HEAD} ours" \
+	ours \
+	"${PARENT} base" \
+	base \
+	"${TAIL}" \
+	theirs \
+	"${END} theirs"
+
+conflict --remove-base --no-remove-base --no-reduce file
+
+also_interactive ss