Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/rebase.py
changeset 30273 86f4ef63d507
parent 30271 0fa1a41d04e4
child 30332 318a24b52eeb 
--- 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:
Mercurial