( )⚙ D12150 merge: fix documented order of `labels` argument

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12150

merge: fix documented order of `labels` argument
ClosedPublic

Authored by martinvonz on Feb 8 2022, 4:26 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGaf9f2c64302e: merge: fix documented order of `labels` argument

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (2 lines)

Diff 32194

mercurial/merge.py

branchmerge = whether to merge between branches branchmerge = whether to merge between branches
force = whether to force branch merging or file overwriting force = whether to force branch merging or file overwriting
matcher = a matcher to filter file lists (dirstate not updated) matcher = a matcher to filter file lists (dirstate not updated)
mergeancestor = whether it is merging with an ancestor. If true, mergeancestor = whether it is merging with an ancestor. If true,
we should accept the incoming changes for any prompts that occur. we should accept the incoming changes for any prompts that occur.
If false, merging with an ancestor (fast-forward) is only allowed If false, merging with an ancestor (fast-forward) is only allowed
between different named branches. This flag is used by rebase extension between different named branches. This flag is used by rebase extension
as a temporary fix and should be avoided in general. as a temporary fix and should be avoided in general.
labels = labels to use for base, local and other labels = labels to use for local, other, and base
mergeforce = whether the merge was run with 'merge --force' (deprecated): if mergeforce = whether the merge was run with 'merge --force' (deprecated): if
this is True, then 'force' should be True as well. this is True, then 'force' should be True as well.
The table below shows all the behaviors of the update command given the The table below shows all the behaviors of the update command given the
-c/--check and -C/--clean or no options, whether the working directory is -c/--check and -C/--clean or no options, whether the working directory is
dirty, whether a revision is specified, and the relationship of the parent dirty, whether a revision is specified, and the relationship of the parent
rev to the target rev (linear or not). Match from top first. The -n rev to the target rev (linear or not). Match from top first. The -n
option doesn't exist on the command line, but represents the option doesn't exist on the command line, but represents the