diff -r 3d38a0bc774f -r 86f4ef63d507 hgext/rebase.py
--- a/hgext/rebase.py	Wed Nov 02 18:45:53 2016 +0000
+++ b/hgext/rebase.py	Wed Nov 02 18:59:29 2016 +0000
@@ -661,6 +661,9 @@
                     _('abort and continue do not allow specifying revisions'))
             if abortf and opts.get('tool', False):
                 ui.warn(_('tool option will be ignored\n'))
+            if contf:
+                ms = mergemod.mergestate.read(repo)
+                cmdutil.checkunresolved(ms)
 
             retcode = rbsrt._prepareabortorcontinue(abortf)
             if retcode is not None: