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/no-reduce-4-none | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 t/no-reduce-4-none (limited to 't/no-reduce-4-none') diff --git a/t/no-reduce-4-none b/t/no-reduce-4-none new file mode 100755 index 0000000..cdb5a0f --- /dev/null +++ b/t/no-reduce-4-none @@ -0,0 +1,23 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} 1" \ + branch-1-first \ + branch-1-second \ + "${PARENT} 2" \ + branch-2-first \ + branch-2-second \ + "${PARENT} 3" \ + branch-3-first \ + branch-3-second \ + "${TAIL} 4" \ + branch-4-first \ + branch-4-second \ + "${END} 4" + +cp -- file file.expected + +conflict --no-reduce file + +also_interactive s -- cgit v1.3.1