Added vimdiff as default diff/merge tool