From 9b98f1a9222e5e96949bf74538a97900f2d847b1 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <m@maandree.se>
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 <m@maandree.se>
---
 t/symmetric-3-all-different | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100755 t/symmetric-3-all-different

(limited to 't/symmetric-3-all-different')

diff --git a/t/symmetric-3-all-different b/t/symmetric-3-all-different
new file mode 100755
index 0000000..0693a80
--- /dev/null
+++ b/t/symmetric-3-all-different
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+. t/common.sh
+
+printf '%s\n' > file \
+	"${HEAD} ours" \
+	first \
+	"${PARENT} 2" \
+	second \
+	"${TAIL}" \
+	third \
+	"${END} theirs"
+
+cp -- file file.expected
+
+conflict --symmetric --no-reduce file
+
+also_interactive y
-- 
cgit v1.3.1