Set vimdiff as merge tool