Add conflcit resultions strategies and interactive mode, and a lot of testsHEAD1.1master

Signed-off-by: Mattias Andrée <m@maandree.se>

4 files changed, 81 insertions, 0 deletions

diff --git a/t/no-option-select-head b/t/no-option-select-head
new file mode 100755
index 0000000..d882b14
--- /dev/null
+++ b/t/no-option-select-head
@@ -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-head file
+
+also_interactive rr
diff --git a/t/no-option-select-head-no-yes b/t/no-option-select-head-no-yes
new file mode 100755
index 0000000..1496892
--- /dev/null
+++ b/t/no-option-select-head-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 \
+	ours
+
+normal --no-select-head --select-head --no-reduce file
+
+also_interactive h
diff --git a/t/no-option-select-head-yes-no b/t/no-option-select-head-yes-no
new file mode 100755
index 0000000..3093de5
--- /dev/null
+++ b/t/no-option-select-head-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-head --no-select-head --no-reduce file
+
+also_interactive s
diff --git a/t/no-option-select-head-yes-then-select-tail-yes-no b/t/no-option-select-head-yes-then-select-tail-yes-no
new file mode 100755
index 0000000..7bc5924
--- /dev/null
+++ b/t/no-option-select-head-yes-then-select-tail-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 \
+	ours
+
+normal --select-head --select-tail --no-select-tail --no-reduce file
+
+also_interactive h