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