facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

filemerge: mark internal-only config option

Browse Source
This commit is contained in:
Matt Mackall 2015-06-25 17:46:55 -05:00
parent 694178b7ed
commit 647579e3af
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mercurial/filemerge.py
View File

@ -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: