aboutsummaryrefslogtreecommitdiffstats
path: root/t/no-option-select-tail
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xt/no-option-select-tail28
-rwxr-xr-xt/no-option-select-tail-no-yes18
-rwxr-xr-xt/no-option-select-tail-yes-no17
-rwxr-xr-xt/no-option-select-tail-yes-then-select-head-yes-no18
4 files changed, 81 insertions, 0 deletions
diff --git a/t/no-option-select-tail b/t/no-option-select-tail
new file mode 100755
index 0000000..8c30d7e
--- /dev/null
+++ b/t/no-option-select-tail
@@ -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-select-tail file
+
+also_interactive rr
diff --git a/t/no-option-select-tail-no-yes b/t/no-option-select-tail-no-yes
new file mode 100755
index 0000000..9984272
--- /dev/null
+++ b/t/no-option-select-tail-no-yes
@@ -0,0 +1,18 @@
+#!/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 \
+ theirs
+
+normal --no-select-tail --select-tail --no-reduce file
+
+also_interactive t
diff --git a/t/no-option-select-tail-yes-no b/t/no-option-select-tail-yes-no
new file mode 100755
index 0000000..b2c3cc9
--- /dev/null
+++ b/t/no-option-select-tail-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 --select-tail --no-select-tail --no-reduce file
+
+also_interactive s
diff --git a/t/no-option-select-tail-yes-then-select-head-yes-no b/t/no-option-select-tail-yes-then-select-head-yes-no
new file mode 100755
index 0000000..a46efa4
--- /dev/null
+++ b/t/no-option-select-tail-yes-then-select-head-yes-no
@@ -0,0 +1,18 @@
+#!/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 \
+ theirs
+
+normal --select-tail --select-head --no-select-head --no-reduce file
+
+also_interactive t