mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
filemerge: mark internal-only config option
This commit is contained in:
parent
694178b7ed
commit
647579e3af
@ -75,6 +75,7 @@ def _picktool(repo, ui, path, binary, symlink):
|
||||
return True
|
||||
return False
|
||||
|
||||
# internal config: ui.forcemerge
|
||||
# forcemerge comes from command line arguments, highest priority
|
||||
force = ui.config('ui', 'forcemerge')
|
||||
if force:
|
||||
|
Loading…
Reference in New Issue
Block a user