aboutsummaryrefslogtreecommitdiffstats
path: root/git-rediff.1
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--git-rediff.12
1 files changed, 1 insertions, 1 deletions
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 ]