Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 25835:34ffe4c29782

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: mark internal-only config option
author Matt Mackall <mpm@selenic.com>
date Thu, 25 Jun 2015 17:46:55 -0500
parents fd7287f0b43c
children 80aba76e29c1
line wrap: on
line diff
--- a/mercurial/filemerge.py	Thu Jun 25 17:46:29 2015 -0500
+++ b/mercurial/filemerge.py	Thu Jun 25 17:46:55 2015 -0500
@@ -75,6 +75,7 @@
             return True
         return False
 
+    # internal config: ui.forcemerge
     # forcemerge comes from command line arguments, highest priority
     force = ui.config('ui', 'forcemerge')
     if force: