git.el: Simplify handling of merge heads in the commit log-edit buffer.