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