mergetool-lib: make the three-way diff the default for vim/gvim