# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1454387312 28800
# Node ID e81d1179403601c6cea06149ef86d667c9963657
# Parent  3feadb0b6c34603f378f6242a3ceef596414c242
merge: add missing doc for 'labels' parameter

diff -r 3feadb0b6c34 -r e81d11794036 mercurial/merge.py
--- 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