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/null-bytes | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 t/null-bytes (limited to 't/null-bytes') diff --git a/t/null-bytes b/t/null-bytes new file mode 100755 index 0000000..9a7ee7f --- /dev/null +++ b/t/null-bytes @@ -0,0 +1,15 @@ +#!/bin/sh -e +. t/common.sh + +( + printf '%s\n' "${HEAD} ours" + printf 'same\000text\n' + printf '%s\n' "${TAIL}" + printf 'same\000text\n' + printf '%s\n' "${END} theirs" +) > file + +printf 'same\000text\n' > file.expected + +"$command" --reduce file +cmp -s -- file file.expected -- cgit v1.3.1