Added config for vimdiff as mergetool