Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: mark internal-only config option
authorMatt Mackall <mpm@selenic.com>
Thu, 25 Jun 2015 17:46:55 -0500
changeset 25835 34ffe4c29782
parent 25834 aca8ae2b0cb2
child 25836 dede675dc0c1
filemerge: mark internal-only config option
mercurial/filemerge.py file | annotate | diff | comparison | revisions 
--- 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:
hg-stable