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/select-head-1 | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 t/select-head-1 (limited to 't/select-head-1') diff --git a/t/select-head-1 b/t/select-head-1 new file mode 100755 index 0000000..f803cf2 --- /dev/null +++ b/t/select-head-1 @@ -0,0 +1,12 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} Head" \ + head \ + "${END} Head" + +printf '%s\n' > file.expected \ + head + +error --select-head --no-reduce file -- cgit v1.3.1