git difftool
ignore vim working files
gitconfig mergetool fix