You can also run 'git mergetool' and choose the 'emerge' option, which is also emacs based but I believe can take the common ancestor of the merge into account

You can also run 'git mergetool' and choose the 'emerge' option, which is also emacs based but I believe can take the common ancestor of the merge into account to help you out as well.