Mercurial > hg-stable

diff mercurial/cmdutil.py @ 27625:cdb9493a7e2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: hook afterresolvedstates
author timeless <timeless@mozdev.org>
date Thu, 24 Dec 2015 20:46:06 +0000
parents d46db4390715
children b502138f5faa
line wrap: on
line diff
--- 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):