diff --git a/hgext/shelve.py b/hgext/shelve.py --- a/hgext/shelve.py +++ b/hgext/shelve.py @@ -452,8 +452,6 @@ def _docreatecmd(ui, repo, pats, opts): wctx = repo[None] parents = wctx.parents() - if len(parents) > 1: - raise error.Abort(_('cannot shelve while merging')) parent = parents[0] origbranch = wctx.branch()