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/marker-size-longer-ignored | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 t/marker-size-longer-ignored (limited to 't/marker-size-longer-ignored') diff --git a/t/marker-size-longer-ignored b/t/marker-size-longer-ignored new file mode 100755 index 0000000..4453d7f --- /dev/null +++ b/t/marker-size-longer-ignored @@ -0,0 +1,16 @@ +#!/bin/sh -e +. t/common.sh + +set_conflict_marker_size 3 file + +printf '%s\n' > file \ + '<<<< not a marker' \ + '|||| not a marker' \ + '==== not a marker' \ + '>>>> not a marker' + +cp -- file file.expected + +normal file + +also_interactive '' -- cgit v1.3.1