diff -r 779e3d9b7a1d -r 3a72c89a83ec mercurial/commands.py --- a/mercurial/commands.py Thu Apr 11 13:30:31 2013 -0700 +++ b/mercurial/commands.py Fri Feb 08 21:08:34 2013 +0000 @@ -1315,8 +1315,6 @@ old = repo['.'] if old.phase() == phases.public: raise util.Abort(_('cannot amend public changesets')) - if len(old.parents()) > 1: - raise util.Abort(_('cannot amend merge changesets')) if len(repo[None].parents()) > 1: raise util.Abort(_('cannot amend while merging')) if (not obsolete._enabled) and old.children():