using emacs for diff and mergetool