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