aboutsummaryrefslogtreecommitdiffstats
path: root/t/no-option-interactive
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xt/no-option-interactive30
-rwxr-xr-xt/no-option-interactive-no-yes20
-rwxr-xr-xt/no-option-interactive-yes-no19
3 files changed, 69 insertions, 0 deletions
diff --git a/t/no-option-interactive b/t/no-option-interactive
new file mode 100755
index 0000000..5609f68
--- /dev/null
+++ b/t/no-option-interactive
@@ -0,0 +1,30 @@
+#!/bin/sh -e
+. t/common.sh
+interactive
+
+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"
+
+printf '%s' q > input
+
+conflict --no-interactive file 8<input 9>output
+test ! -s output
diff --git a/t/no-option-interactive-no-yes b/t/no-option-interactive-no-yes
new file mode 100755
index 0000000..7417667
--- /dev/null
+++ b/t/no-option-interactive-no-yes
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+. t/common.sh
+
+interactive
+
+printf '%s\n' > file \
+ "${HEAD} ours" \
+ ours \
+ "${PARENT} base" \
+ base \
+ "${TAIL}" \
+ theirs \
+ "${END} theirs"
+
+printf '%s\n' > file.expected \
+ ours
+
+printf '%s' h > input
+
+normal --no-interactive --interactive --no-reduce file 8<input 9>output
diff --git a/t/no-option-interactive-yes-no b/t/no-option-interactive-yes-no
new file mode 100755
index 0000000..2a3b0c4
--- /dev/null
+++ b/t/no-option-interactive-yes-no
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+. t/common.sh
+
+interactive
+
+printf '%s\n' > file \
+ "${HEAD} ours" \
+ ours \
+ "${PARENT} base" \
+ base \
+ "${TAIL}" \
+ theirs \
+ "${END} theirs"
+
+cp -- file file.expected
+
+printf '%s' q > input
+
+conflict --interactive --no-interactive --no-reduce file 8<input 9>output