Integrating vimdiff with git