Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix documented order of `labels` argument
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 18 Jan 2022 13:22:55 -0800
changeset 48757 af9f2c64302e
parent 48756 86e4b86df932
child 48758 7dad4665d223
merge: fix documented order of `labels` argument Differential Revision: https://phab.mercurial-scm.org/D12150
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- 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.
Mercurial