From d8de1b23e8ec896759424a2f146969783cdd89e3 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 22 Sep 2026 19:53:29 +0200 Subject: Add conflcit resultions strategies and interactive mode, and a lot of tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- t/invalid-option-combinations | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100755 t/invalid-option-combinations (limited to 't/invalid-option-combinations') 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 -- cgit v1.3.1