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

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