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/missing-newline-non-conflict | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 t/missing-newline-non-conflict (limited to 't/missing-newline-non-conflict') diff --git a/t/missing-newline-non-conflict b/t/missing-newline-non-conflict new file mode 100755 index 0000000..a89640a --- /dev/null +++ b/t/missing-newline-non-conflict @@ -0,0 +1,10 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s' 'non-conflict without newline' > file + +cp -- file file.expected + +normal file + +also_interactive '' -- cgit v1.3.1