Configure vimdiff as merge tool