Improve the git mergetool

Still not sure it's that useful over regular vimdiff, so not setting to
the default now.