# HG changeset patch
# User Taapas Agrawal <taapas2897@gmail.com>
# Date 2019-06-19 19:29:16
# Node ID e9f2252e218ec7044ad3f2886feea2a59f810c67
# Parent  f5ef8c85477d3add09dbf6f3210209bab41d8639

shelve: removed redundant merge detection method

Differential Revision: https://phab.mercurial-scm.org/D6547

diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -452,8 +452,6 @@ def createcmd(ui, repo, pats, opts):
 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()
 
@@ -979,12 +977,6 @@ def _dounshelve(ui, repo, *shelved, **op
             return unshelvecontinue(ui, repo, state, opts)
     elif len(shelved) > 1:
         raise error.Abort(_('can only unshelve one change at a time'))
-
-    # abort unshelve while merging (issue5123)
-    parents = repo[None].parents()
-    if len(parents) > 1:
-        raise error.Abort(_('cannot unshelve while merging'))
-
     elif not shelved:
         shelved = listshelves(repo)
         if not shelved: