From d8de1b23e8ec896759424a2f146969783cdd89e3 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <m@maandree.se>
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 <m@maandree.se>
---
 t/no-option-interactive-yes-no | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100755 t/no-option-interactive-yes-no

(limited to 't/no-option-interactive-yes-no')

diff --git a/t/no-option-interactive-yes-no b/t/no-option-interactive-yes-no
new file mode 100755
index 0000000..2a3b0c4
--- /dev/null
+++ b/t/no-option-interactive-yes-no
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+. t/common.sh
+
+interactive
+
+printf '%s\n' > file \
+	"${HEAD} ours" \
+	ours \
+	"${PARENT} base" \
+	base \
+	"${TAIL}" \
+	theirs \
+	"${END} theirs"
+
+cp -- file file.expected
+
+printf '%s' q > input
+
+conflict --interactive --no-interactive --no-reduce file 8<input 9>output
-- 
cgit v1.3.1