aboutsummaryrefslogtreecommitdiffstats
path: root/t/remove-base-2
diff options
context:
space:
mode:
Diffstat (limited to 't/remove-base-2')
-rwxr-xr-xt/remove-base-215
1 files changed, 15 insertions, 0 deletions
diff --git a/t/remove-base-2 b/t/remove-base-2
new file mode 100755
index 0000000..c4a4fb6
--- /dev/null
+++ b/t/remove-base-2
@@ -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 --remove-base --no-reduce file
+
+also_interactive b