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.