From 7c19d0103e46c9e59b512095693491a4093a13f3 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <m@maandree.se>
Date: Fri, 25 Sep 2026 19:19:15 +0200
Subject: Add support for combining --merge and --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/all-positive-options-symmetric | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100755 t/all-positive-options-symmetric

(limited to 't/all-positive-options-symmetric')

diff --git a/t/all-positive-options-symmetric b/t/all-positive-options-symmetric
deleted file mode 100755
index eb53cb9..0000000
--- a/t/all-positive-options-symmetric
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh -e
-. t/common.sh
-interactive
-
-printf '%s\n' > file \
-	"${HEAD} ours" \
-	same \
-	ours \
-	"${PARENT} base" \
-	same \
-	base \
-	"${TAIL}" \
-	same \
-	theirs \
-	"${END} theirs"
-
-printf '%s\n' > file.expected \
-	same \
-	ours
-
-printf '%s' h > input
-normal --symmetric --remove-base --reduce --interactive file 8<input 9>output
-test -s output
-- 
cgit v1.3.1