changed vimdiff configuration to utilize git difftool.