This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6483

help: remove repeated word in 'hg help rebase'
ClosedPublic

Authored by amalloy on Jun 5 2019, 6:20 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1314c0bb6b24: help: remove repeated word in 'hg help rebase'
Summary

Specifically, the second 'with' in 'with which to merge with'.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

amalloy created this revision.Jun 5 2019, 6:20 PM
martinvonz added a subscriber: martinvonz.Jun 6 2019, 1:15 AM

I'm pretty sure you should not change it in the i18n/ directory; I think those are updated by the translators for each language. I'll take this patch and I'll remove all the i18n changes.

durin42 added a subscriber: durin42.Jun 12 2019, 12:21 PM
In D6483#94130, @martinvonz wrote:

I'm pretty sure you should not change it in the i18n/ directory; I think those are updated by the translators for each language. I'll take this patch and I'll remove all the i18n changes.

Yep, that's correct. I'll take the patch that way, thanks.

amalloy added a commit: rHG1314c0bb6b24: help: remove repeated word in 'hg help rebase'.Jun 12 2019, 12:45 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG1314c0bb6b24: help: remove repeated word in 'hg help rebase' (authored by amalloy). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)

Diff 15458

mercurial/commands.py

``--tool`` can be used to specify the merge tool used for file ``--tool`` can be used to specify the merge tool used for file
merges. It overrides the HGMERGE environment variable and your merges. It overrides the HGMERGE environment variable and your
configuration files. See :hg:`help merge-tools` for options. configuration files. See :hg:`help merge-tools` for options.
If no revision is specified, the working directory's parent is a If no revision is specified, the working directory's parent is a
head revision, and the current branch contains exactly one other head revision, and the current branch contains exactly one other
head, the other head is merged with by default. Otherwise, an 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. See :hg:`help resolve` for information on handling file conflicts.
To undo an uncommitted merge, use :hg:`merge --abort` which To undo an uncommitted merge, use :hg:`merge --abort` which
will check out a clean copy of the original merge parent, losing will check out a clean copy of the original merge parent, losing
all changes. all changes.
Returns 0 on success, 1 if there are unresolved files. Returns 0 on success, 1 if there are unresolved files.