Fix diff/merge tool for Git from GVim to Vim