Use vim-fugitive as a merge tool.