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

diff --git a/t/reduce-2-non-aligned b/t/reduce-2-non-aligned
new file mode 100755
index 0000000..58202d1
--- /dev/null
+++ b/t/reduce-2-non-aligned
@@ -0,0 +1,43 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+	"${HEAD} 1" \
+	before-common-first \
+	before-common-second \
+	head-only-first \
+	head-only-second \
+	middle-common-first \
+	middle-common-second \
+	head-last \
+	"${TAIL} 2" \
+	before-common-first \
+	before-common-second \
+	tail-only \
+	middle-common-first \
+	middle-common-second \
+	tail-last-first \
+	tail-last-second \
+	"${END} 2"
+
+printf '%s\n' > file.expected \
+	before-common-first \
+	before-common-second \
+	"${HEAD} 1" \
+	head-only-first \
+	head-only-second \
+	"${TAIL} 2" \
+	tail-only \
+	"${END} 2" \
+	middle-common-first \
+	middle-common-second \
+	"${HEAD} 1" \
+	head-last \
+	"${TAIL} 2" \
+	tail-last-first \
+	tail-last-second \
+	"${END} 2"
+
+conflict --reduce file
+
+also_interactive rrr