# HG changeset patch # User Durham Goode # Date 1453246223 28800 # Node ID ea7523380efa894213582ca1600dc472baa7b25e # Parent 91e67ad4cb6c783fa1a32e03359aa6d73c765129 test: update with new graft output Graft now has a --continue it seems. We need to update our test output. 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