Mercurial > public > mercurial-scm > hg

diff tests/test-issue1175.t @ 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 ef1eb6df7071
children fc1d75e7a98d
line wrap: on
line diff
--- a/tests/test-issue1175.t	Thu Dec 24 19:25:44 2015 +0000
+++ b/tests/test-issue1175.t	Thu Dec 24 20:46:06 2015 +0000
@@ -78,6 +78,7 @@
   $ echo b3 >> b
   $ hg resolve --mark b
   (no more unresolved files)
+  continue: hg graft --continue
   $ hg graft --continue
   grafting 1:5974126fad84 "b1"
   warning: can't find ancestor for 'b' copied from 'a'!