Show More
| @@ -75,6 +75,7 b' def _picktool(repo, ui, path, binary, sy' | |||||
| 75 | return True |
|
75 | return True | |
| 76 | return False |
|
76 | return False | |
| 77 |
|
77 | |||
|
|
78 | # internal config: ui.forcemerge | |||
| 78 | # forcemerge comes from command line arguments, highest priority |
|
79 | # forcemerge comes from command line arguments, highest priority | |
| 79 | force = ui.config('ui', 'forcemerge') |
|
80 | force = ui.config('ui', 'forcemerge') | |
| 80 | if force: |
|
81 | if force: | |
General Comments 0
You need to be logged in to leave comments.
Login now