git: use vimdiff as merge tool