Emacs ediff configuration
Combine merge-/difftool into vcstool