magit/magit — pull request #341 by pjweisberg (2012-01-14 22:13:45+00:00)
Title: Allow "empty" merge commits

* magit.el (magit-log-edit-commit): Don't "refus[e] to create empty
commit" when the commit is a merge, even if it doesn't change any
files.

I also rewrote the 'if' condition into an easier-to-read list of
conditions where a commit is allowed.