Mercurial > hg
changeset 42448:1314c0bb6b24
help: remove repeated word in 'hg help rebase'
Specifically, the second 'with' in 'with which to merge with'.
Differential Revision: https://phab.mercurial-scm.org/D6483
author | amalloy |
---|---|
date | Fri, 31 May 2019 10:12:56 -0700 |
parents | cda591d2bfe1 |
children | c19d259fd6ad |
files | mercurial/commands.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Jun 10 15:35:06 2019 -0700 +++ b/mercurial/commands.py Fri May 31 10:12:56 2019 -0700 @@ -3991,7 +3991,7 @@ If no revision is specified, the working directory's parent is a head revision, and the current branch contains exactly one other head, the other head is merged with by default. Otherwise, an - explicit revision with which to merge with must be provided. + explicit revision with which to merge must be provided. See :hg:`help resolve` for information on handling file conflicts.