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: