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

diff --git a/t/missing-newline-non-conflict b/t/missing-newline-non-conflict
new file mode 100755
index 0000000..a89640a
--- /dev/null
+++ b/t/missing-newline-non-conflict
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s' 'non-conflict without newline' > file
+
+cp -- file file.expected
+
+normal file
+
+also_interactive ''