diff options
| author | Mattias Andrée <m@maandree.se> | 2026-09-25 19:19:15 +0200 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2026-09-25 19:19:15 +0200 |
| commit | 7c19d0103e46c9e59b512095693491a4093a13f3 (patch) | |
| tree | 85a9cd750a1fa317b6d3866add9d546c7df44b56 /git-rediff.1 | |
| parent | Add --symmetric (diff) | |
| download | git-rediff-7c19d0103e46c9e59b512095693491a4093a13f3.tar.gz git-rediff-7c19d0103e46c9e59b512095693491a4093a13f3.tar.bz2 git-rediff-7c19d0103e46c9e59b512095693491a4093a13f3.tar.xz | |
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 'git-rediff.1')
| -rw-r--r-- | git-rediff.1 | 2 |
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 ] |