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

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

1 files changed, 55 insertions, 0 deletions

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