From 9b98f1a9222e5e96949bf74538a97900f2d847b1 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 24 Sep 2026 23:19:13 +0200 Subject: Add --symmetric MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- t/symmetric-3-empty-tail | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 t/symmetric-3-empty-tail (limited to 't/symmetric-3-empty-tail') diff --git a/t/symmetric-3-empty-tail b/t/symmetric-3-empty-tail new file mode 100755 index 0000000..bbd4e7a --- /dev/null +++ b/t/symmetric-3-empty-tail @@ -0,0 +1,16 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + 1 \ + "${PARENT} 2" \ + 1 \ + "${TAIL}" \ + "${END} theirs" + +cp -- file file.expected + +conflict --symmetric --no-reduce file + +also_interactive y -- cgit v1.3.1