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>
---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'README')

diff --git a/README b/README
index 9940917..7340a78 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ NAME
 	git-rediff - Reduce partially resolved merge conflicts
 
 SYNOPSIS
-	git rediff [--merge|--symmetric|--select-head|--select-tail]
+	git rediff [-my|--select-head|--select-tail]
 	           [--remove-base] [--no-reduce] [-i] [<path>...]
 
 DESCRIPTION
-- 
cgit v1.3.1