Fixed issue #2514: diff uses wrong tool in case the filename matches a registered...