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-option-merge | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100755 t/no-option-merge (limited to 't/no-option-merge') diff --git a/t/no-option-merge b/t/no-option-merge new file mode 100755 index 0000000..5f55d74 --- /dev/null +++ b/t/no-option-merge @@ -0,0 +1,28 @@ +#!/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 \ + "${HEAD} ours" \ + ours \ + "${PARENT} base" \ + base \ + "${TAIL}" \ + theirs \ + "${END} theirs" + +conflict --no-merge file + +also_interactive rr -- cgit v1.3.1