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