What I have learned is that you can set your GIT_EDITOR environment variable in a way that accepts the standard git merge message.
In your .bashrc or .zshrc, add this:
export GIT_EDITOR='true git commit'
By exporting this GIT_EDITOR value, you are signalling to the Git prompt: 👍 and commit!