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

diff --git a/t/select-tail-no-conflicts b/t/select-tail-no-conflicts
new file mode 100755
index 0000000..ba98700
--- /dev/null
+++ b/t/select-tail-no-conflicts
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+	no conflicts in this file
+
+cp -- file file.expected
+
+normal --select-tail --no-reduce file
+
+also_interactive ''