Skip to content
Snippets Groups Projects
Commit af9f2c64 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

merge: fix documented order of `labels` argument

Differential Revision: https://phab.mercurial-scm.org/D12150
parent 86e4b86d
No related branches found
No related tags found
No related merge requests found
......@@ -1833,7 +1833,7 @@
If false, merging with an ancestor (fast-forward) is only allowed
between different named branches. This flag is used by rebase extension
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
this is True, then 'force' should be True as well.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment