# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1435272415 18000
# Node ID 34ffe4c29782c06f673ed0d9752a44f6b5adb8b1
# Parent  aca8ae2b0cb212cbdf1eed5bb0c423b4eb1b802b
filemerge: mark internal-only config option

diff -r aca8ae2b0cb2 -r 34ffe4c29782 mercurial/filemerge.py
--- 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: