From 7c19d0103e46c9e59b512095693491a4093a13f3 Mon Sep 17 00:00:00 2001 From: Mattias Andrée 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 --- git-rediff.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-rediff.1') diff --git a/git-rediff.1 b/git-rediff.1 index e06a9fb..dbe9051 100644 --- a/git-rediff.1 +++ b/git-rediff.1 @@ -3,7 +3,7 @@ git-rediff - Reduce partially resolved merge conflicts .SH SYNOPSIS .B git rediff -.RB [ --merge | --symmetric | --select-head | --select-tail ] +.RB [ -my | --select-head | --select-tail ] .RB [ --remove-base ] .RB [ --no-reduce ] .RB [ -i ] -- cgit v1.3.1