# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1642540975 28800
# Node ID af9f2c64302e8084b775f18cb96c0162255ac45f
# Parent  86e4b86df932222306b21dbe9ea7b00e934e9ef3
merge: fix documented order of `labels` argument

Differential Revision: https://phab.mercurial-scm.org/D12150

diff -r 86e4b86df932 -r af9f2c64302e mercurial/merge.py
--- 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.