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/remove-base-multiple-hunks | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 t/remove-base-multiple-hunks (limited to 't/remove-base-multiple-hunks') diff --git a/t/remove-base-multiple-hunks b/t/remove-base-multiple-hunks new file mode 100755 index 0000000..c3fdc0f --- /dev/null +++ b/t/remove-base-multiple-hunks @@ -0,0 +1,36 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} first" \ + first-head \ + "${TAIL}" \ + first-tail \ + "${END}" \ + between \ + "${HEAD} second" \ + second-head \ + "${PARENT} middle" \ + second-middle \ + "${TAIL}" \ + second-tail \ + "${END}" \ + after + +printf '%s\n' > file.expected \ + "${HEAD} first" \ + first-head \ + "${TAIL}" \ + first-tail \ + "${END}" \ + between \ + "${HEAD} second" \ + second-head \ + "${TAIL}" \ + second-tail \ + "${END}" \ + after + +conflict --remove-base --no-reduce file + +also_interactive bbbb -- cgit v1.3.1