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/stdin-dash-operand | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 t/stdin-dash-operand (limited to 't/stdin-dash-operand') diff --git a/t/stdin-dash-operand b/t/stdin-dash-operand new file mode 100755 index 0000000..42d960a --- /dev/null +++ b/t/stdin-dash-operand @@ -0,0 +1,21 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} HEAD" \ + same \ + "${TAIL}" \ + same \ + "${END} branch" + +printf '%s\n' > file.expected \ + same + +cp -- file input +normal --reduce - < input > output +cmp -s -- file input +diff -u -- output file.expected >&2 + +also_interactive r < input > output +cmp -s -- file input +diff -u -- output file.expected >&2 -- cgit v1.3.1