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-4-unique-different-middles | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 t/symmetric-4-unique-different-middles (limited to 't/symmetric-4-unique-different-middles') diff --git a/t/symmetric-4-unique-different-middles b/t/symmetric-4-unique-different-middles new file mode 100755 index 0000000..1b76187 --- /dev/null +++ b/t/symmetric-4-unique-different-middles @@ -0,0 +1,23 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + "${HEAD} ours" \ + same \ + "${PARENT} 2" \ + common \ + first \ + common \ + "${PARENT} 3" \ + common \ + second \ + common \ + "${TAIL}" \ + same \ + "${END} theirs" + +cp -- file file.expected + +conflict --symmetric --no-reduce file + +also_interactive y -- cgit v1.3.1