Use emacs for merging in git