Fix git mergetool and difftool.