Mercurial > hg
changeset 48757:af9f2c64302e
merge: fix documented order of `labels` argument
Differential Revision: https://phab.mercurial-scm.org/D12150
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 18 Jan 2022 13:22:55 -0800 |
| parents | 86e4b86df932 |
| children | 7dad4665d223 |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Tue Jan 18 12:57:55 2022 -0800 +++ b/mercurial/merge.py Tue Jan 18 13:22:55 2022 -0800 @@ -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.