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

diff --git a/t/marker-size-shorter-ignored b/t/marker-size-shorter-ignored
new file mode 100755
index 0000000..cf16be7
--- /dev/null
+++ b/t/marker-size-shorter-ignored
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+. t/common.sh
+
+set_conflict_marker_size 3 file
+
+printf '%s\n' > file \
+	'<< not a marker' \
+	'| not a marker' \
+	'== not a marker' \
+	'> not a marker'
+
+cp -- file file.expected
+
+normal file
+
+also_interactive ''