fix mergetool and difftool for obscure file names