Mercurial > hg

changeset 28019:e81d11794036

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add missing doc for 'labels' parameter
author Siddharth Agarwal <sid0@fb.com>
date Mon, 01 Feb 2016 20:28:32 -0800
parents 3feadb0b6c34
children cffa46cbdb8f
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Feb 01 20:28:32 2016 -0800
+++ b/mercurial/merge.py	Mon Feb 01 20:28:32 2016 -0800
@@ -1357,6 +1357,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
 
     The table below shows all the behaviors of the update command
     given the -c and -C or no options, whether the working directory