Try using fugitive for mergetool

Using this instead of vimdiff should make life easier, as Gdiff has
nicer features for pulling hunks.