vimdiff as mergetool