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

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

1 files changed, 46 insertions, 0 deletions

diff --git a/t/reduce-4-head b/t/reduce-4-head
new file mode 100755
index 0000000..9d36033
--- /dev/null
+++ b/t/reduce-4-head
@@ -0,0 +1,46 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+	"${HEAD} 1" \
+	head-common-first \
+	head-common-second \
+	branch-1-first \
+	branch-1-second \
+	"${PARENT} 2" \
+	head-common-first \
+	head-common-second \
+	branch-2-first \
+	branch-2-second \
+	"${PARENT} 3" \
+	head-common-first \
+	head-common-second \
+	branch-3-first \
+	branch-3-second \
+	"${TAIL} 4" \
+	head-common-first \
+	head-common-second \
+	branch-4-first \
+	branch-4-second \
+	"${END} 4"
+
+printf '%s\n' > file.expected \
+	head-common-first \
+	head-common-second \
+	"${HEAD} 1" \
+	branch-1-first \
+	branch-1-second \
+	"${PARENT} 2" \
+	branch-2-first \
+	branch-2-second \
+	"${PARENT} 3" \
+	branch-3-first \
+	branch-3-second \
+	"${TAIL} 4" \
+	branch-4-first \
+	branch-4-second \
+	"${END} 4"
+
+conflict --reduce file
+
+also_interactive rr