diff -r 91e67ad4cb6c -r ea7523380efa tests/test-evolve.t --- a/tests/test-evolve.t Sun Jan 17 22:02:44 2016 -0800 +++ b/tests/test-evolve.t Tue Jan 19 15:30:23 2016 -0800 @@ -601,6 +601,7 @@ $ echo 3 > 1 $ hg resolve -m 1 (no more unresolved files) + continue: hg graft --continue $ hg graft --continue -O grafting 7:a5bfd90a2f29 "conflict" (tip) $ glog --hidden