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