diff -r dc5e5577af39 -r e429e7c801b2 mercurial/shelve.py
--- a/mercurial/shelve.py	Mon Jul 13 16:42:44 2020 -0700
+++ b/mercurial/shelve.py	Tue Jul 14 13:35:54 2020 -0700
@@ -1014,12 +1014,7 @@
                 activebookmark,
                 interactive,
             )
-            raise error.InterventionRequired(
-                _(
-                    b"unresolved conflicts (see 'hg resolve', then "
-                    b"'hg unshelve --continue')"
-                )
-            )
+            raise error.ConflictResolutionRequired(b'unshelve')
 
         with repo.dirstate.parentchange():
             repo.setparents(tmpwctx.node(), nodemod.nullid)