[Updated] D12150: merge: fix documented order of `labels` argument

[martinvonz (Martin von Zweigbergk)]

Closed by commit rHGaf9f2c64302e: merge: fix documented order of `labels` argument (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D12150?vs=32099&id=32194

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D12150/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D12150

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -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.
 



To: martinvonz, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220215/a99f7aca/attachment-0002.html>