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