Use Emacs ediff as diff and merge tools