##// END OF EJS Templates
merge: fix documented order of `labels` argument...
Martin von Zweigbergk -
r49601:af9f2c64 default
parent child Browse files
Show More
@@ -1833,7 +1833,7 b' def _update('
1833 If false, merging with an ancestor (fast-forward) is only allowed
1833 If false, merging with an ancestor (fast-forward) is only allowed
1834 between different named branches. This flag is used by rebase extension
1834 between different named branches. This flag is used by rebase extension
1835 as a temporary fix and should be avoided in general.
1835 as a temporary fix and should be avoided in general.
1836 labels = labels to use for base, local and other
1836 labels = labels to use for local, other, and base
1837 mergeforce = whether the merge was run with 'merge --force' (deprecated): if
1837 mergeforce = whether the merge was run with 'merge --force' (deprecated): if
1838 this is True, then 'force' should be True as well.
1838 this is True, then 'force' should be True as well.
1839
1839
General Comments 0
You need to be logged in to leave comments. Login now