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/unexpected-separator-parent | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 t/unexpected-separator-parent (limited to 't/unexpected-separator-parent') diff --git a/t/unexpected-separator-parent b/t/unexpected-separator-parent new file mode 100755 index 0000000..1b86d70 --- /dev/null +++ b/t/unexpected-separator-parent @@ -0,0 +1,11 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${PARENT} base" + +cp -- file file.original + +error file + +diff -u -- file file.original >&2 -- cgit v1.3.1