mercurial/cmdutil.py
changeset 42616 5162753c4c14
parent 42582 5171937ad0f9
child 42643 ce52377102db
--- a/mercurial/cmdutil.py	Sun Jul 07 10:54:41 2019 -0400
+++ b/mercurial/cmdutil.py	Tue Jul 02 18:02:12 2019 +0530
@@ -266,8 +266,8 @@
         In the end we'll record interesting changes, and everything else
         will be left in place, so the user can continue working.
         """
-
-        checkunfinished(repo, commit=True)
+        if not opts.get('interactive-unshelve'):
+            checkunfinished(repo, commit=True)
         wctx = repo[None]
         merge = len(wctx.parents()) > 1
         if merge: