--- a/mercurial/cmdutil.py Thu Dec 24 19:25:44 2015 +0000
+++ b/mercurial/cmdutil.py Thu Dec 24 20:46:06 2015 +0000
@@ -3364,6 +3364,8 @@
util.unlink(repo.join(f))
afterresolvedstates = [
+ ('graftstate',
+ _('hg graft --continue')),
]
def checkafterresolved(repo):