Use tilde for excludesfile.
Remove mergetool: vimdiff is not very good at it.
Use vimdiff instead of mvimdiff.