GIT_EDITOR->emacsclient.
Merge.