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

diff --git a/t/invalid-option-combinations b/t/invalid-option-combinations
new file mode 100755
index 0000000..527ce63
--- /dev/null
+++ b/t/invalid-option-combinations
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' text > file
+cp -- file file.expected
+
+error --merge --select-head file
+error --select-head --merge file
+error --merge --select-tail file
+error --select-tail --merge file
+error --select-head --select-tail file
+error --select-tail --select-head file
+error --merge --select-head --select-tail file
+error --merge --select-tail --select-head file
+error --select-head --merge --select-tail file
+error --select-head --select-tail --merge file
+error --select-tail --merge --select-head file
+error --select-tail --select-head --merge file
+error --unknown-option file
+error '-$' file