diff --git a/eden/scm/edenscm/mercurial/commands/__init__.py b/eden/scm/edenscm/mercurial/commands/__init__.py
index 2521f956b3..c7ec394a28 100644
--- a/eden/scm/edenscm/mercurial/commands/__init__.py
+++ b/eden/scm/edenscm/mercurial/commands/__init__.py
@@ -1910,7 +1910,12 @@ def continuecmd(ui, repo):
                 ui.status(_("(exiting merge state)\n"))
                 ms.reset()
             else:
-                raise error.Abort(_("outstanding merge conflicts"))
+                raise error.Abort(
+                    _("outstanding merge conflicts"),
+                    hint=_(
+                        "use 'hg resolve -l' to see a list of conflicted files, 'hg resolve -m' to mark files as resolved"
+                    ),
+                )
         else:
             raise error.Abort(_("nothing to continue"))
 
diff --git a/eden/scm/tests/test-update-merge-state-t.py b/eden/scm/tests/test-update-merge-state-t.py
index 5a6480fd1c..913969f3c9 100644
--- a/eden/scm/tests/test-update-merge-state-t.py
+++ b/eden/scm/tests/test-update-merge-state-t.py
@@ -112,6 +112,7 @@ sh % "hg continue"
 createstate(command="backout")
 sh % "hg continue" == r"""
     abort: outstanding merge conflicts
+    (use 'hg resolve -l' to see a list of conflicted files, 'hg resolve -m' to mark files as resolved)
     [255]"""
 sh % "hg resolve --all -t :local" == "(no more unresolved files)"
 sh % "hg status" == r"""