##// END OF EJS Templates
merge: add missing doc for 'labels' parameter
Siddharth Agarwal -
r28019:e81d1179 default
parent child Browse files
Show More
@@ -1357,6 +1357,7 b' def update(repo, node, branchmerge, forc'
1357 If false, merging with an ancestor (fast-forward) is only allowed
1357 If false, merging with an ancestor (fast-forward) is only allowed
1358 between different named branches. This flag is used by rebase extension
1358 between different named branches. This flag is used by rebase extension
1359 as a temporary fix and should be avoided in general.
1359 as a temporary fix and should be avoided in general.
1360 labels = labels to use for base, local and other
1360
1361
1361 The table below shows all the behaviors of the update command
1362 The table below shows all the behaviors of the update command
1362 given the -c and -C or no options, whether the working directory
1363 given the -c and -C or no options, whether the working directory
General Comments 0
You need to be logged in to leave comments. Login now