use diffmerge for git difftool and mergetool