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/interactive-two-files | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100755 t/interactive-two-files (limited to 't/interactive-two-files') diff --git a/t/interactive-two-files b/t/interactive-two-files new file mode 100755 index 0000000..c2c3f02 --- /dev/null +++ b/t/interactive-two-files @@ -0,0 +1,44 @@ +#!/bin/sh -e +. t/common.sh +interactive + +printf '%s\n' > file \ + "${HEAD} ours" \ + ours-1 \ + "${TAIL}" \ + theirs-1 \ + "${END} theirs" + +printf '%s\n' > file.expected \ + theirs-1 + +printf '%s\n' > file2 \ + "${HEAD} ours" \ + ours-2 \ + "${TAIL}" \ + theirs-2 \ + "${END} theirs" + +printf '%s\n' > file2.expected \ + ours-2 + +( + interactive_filename file + interactive_marker "${HEAD} ours" + interactive_side ours-1 + interactive_marker "${TAIL}" + interactive_side theirs-1 + interactive_marker "${END} theirs" + interactive_prompt 1 1 + interactive_filename file2 + interactive_marker "${HEAD} ours" + interactive_side ours-2 + interactive_marker "${TAIL}" + interactive_side theirs-2 + interactive_marker "${END} theirs" + interactive_prompt 1 1 +) > output.expected + +printf '%s' th > input +normal --interactive file file2 8output +diff -u -- output.expected output >&2 -- cgit v1.3.1