Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/commands.py
changeset 18909 3a72c89a83ec
parent 18906 ef7068173a22
child 18955 f3245f22771c 
--- 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():
mercurial