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