Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 48757 af9f2c64302e
parent 48746 18e69f224e4b
child 48805 d4486810a179 
--- 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