problems with git difftool and diff