Git merge using emacs as the mergetool