##// END OF EJS Templates
filemerge: more backwards compatible behavior for ui.merge...
filemerge: more backwards compatible behavior for ui.merge if ui.merge matches a tool in [merge-tools], it is used as the default tool selection but may be rejected by binary or gui or other checks. If ui.merge does not match a merge tool, it is used unconditionally.

File last commit:

r0:9117c656 default
r6076:0ee885fe default
Show More
__init__.py
0 lines | 0 B | text/x-python | PythonLexer