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/mixed-marker-sizes | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100755 t/mixed-marker-sizes (limited to 't/mixed-marker-sizes') diff --git a/t/mixed-marker-sizes b/t/mixed-marker-sizes new file mode 100755 index 0000000..8cd186b --- /dev/null +++ b/t/mixed-marker-sizes @@ -0,0 +1,30 @@ +#!/bin/sh -e +. t/common.sh + +set_conflict_marker_size 3 small + +printf '%s\n' > small \ + "${HEAD} small-head" \ + shared \ + "${TAIL}" \ + shared \ + "${END} small-tail" + +printf '%s\n' > small.expected \ + shared + +set_conflict_marker_size 10 large + +printf '%s\n' > large \ + "${HEAD} large-head" \ + shared \ + "${TAIL}" \ + shared \ + "${END} large-tail" + +printf '%s\n' > large.expected \ + shared + +normal small large + +also_interactive rr -- cgit v1.3.1