diff -r b3376fba4ab9 -r d46db4390715 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Mon Jan 04 21:52:44 2016 -0800
+++ b/mercurial/cmdutil.py	Thu Dec 24 19:25:44 2015 +0000
@@ -3363,6 +3363,17 @@
         if clearable and repo.vfs.exists(f):
             util.unlink(repo.join(f))
 
+afterresolvedstates = [
+    ]
+
+def checkafterresolved(repo):
+    contmsg = _("continue: %s\n")
+    for f, msg in afterresolvedstates:
+        if repo.vfs.exists(f):
+            repo.ui.warn(contmsg % msg)
+            return
+    repo.ui.note(contmsg % _("hg commit"))
+
 class dirstateguard(object):
     '''Restore dirstate at unexpected failure.