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, 68 insertions, 0 deletions

diff --git a/t/select-tail-3 b/t/select-tail-3
new file mode 100755
index 0000000..7a7962a
--- /dev/null
+++ b/t/select-tail-3
@@ -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 --no-reduce file
+
+also_interactive t
diff --git a/t/select-tail-3-empty-base b/t/select-tail-3-empty-base
new file mode 100755
index 0000000..6e88956
--- /dev/null
+++ b/t/select-tail-3-empty-base
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+	"${HEAD} head" \
+	ours \
+	"${PARENT} parent" \
+	"${TAIL}" \
+	theirs \
+	"${END} tail"
+
+printf '%s\n' > file.expected \
+	theirs
+
+normal --select-tail --no-reduce file
+
+also_interactive t
diff --git a/t/select-tail-3-empty-head b/t/select-tail-3-empty-head
new file mode 100755
index 0000000..424c73b
--- /dev/null
+++ b/t/select-tail-3-empty-head
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+	"${HEAD} OURS" \
+	"${PARENT} BASE" \
+	base \
+	"${TAIL}" \
+	theirs \
+	"${END} THEIRS"
+
+printf '%s\n' > file.expected \
+	theirs
+
+normal --select-tail --no-reduce file
+
+also_interactive t
diff --git a/t/select-tail-3-empty-tail b/t/select-tail-3-empty-tail
new file mode 100755
index 0000000..d625068
--- /dev/null
+++ b/t/select-tail-3-empty-tail
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+	"${HEAD} ours" \
+	ours \
+	"${PARENT} base" \
+	base \
+	"${TAIL}" \
+	"${END} theirs"
+
+: > file.expected
+
+normal --select-tail --no-reduce file
+
+also_interactive t