Skip to content
Snippets Groups Projects
Commit 34ffe4c2 authored by Matt Mackall's avatar Matt Mackall
Browse files

filemerge: mark internal-only config option

parent aca8ae2b
No related branches found
No related tags found
No related merge requests found
......@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment