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-multiple-conflicts | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100755 t/symmetric-multiple-conflicts (limited to 't/symmetric-multiple-conflicts') diff --git a/t/symmetric-multiple-conflicts b/t/symmetric-multiple-conflicts new file mode 100755 index 0000000..713a96c --- /dev/null +++ b/t/symmetric-multiple-conflicts @@ -0,0 +1,42 @@ +#!/bin/sh -e +. t/common.sh + +printf '%s\n' > file \ + before \ + "${HEAD} ours" \ + same \ + "${PARENT} base" \ + different-interior \ + "${TAIL}" \ + same \ + "${END} theirs" \ + between \ + "${HEAD} ours" \ + different-head \ + "${PARENT} base" \ + interior \ + "${PARENT} other" \ + interior \ + "${TAIL}" \ + same \ + "${END} theirs" \ + after + +printf '%s\n' > file.expected \ + before \ + same \ + between \ + "${HEAD} ours" \ + different-head \ + "${PARENT} base" \ + interior \ + "${PARENT} other" \ + interior \ + "${TAIL}" \ + same \ + "${END} theirs" \ + after + +conflict --symmetric --no-reduce file + +also_interactive yy -- cgit v1.3.1