changeset 4052 | 73e73471d6c6 |
parent 4051 | ddae36b4031e |
child 4053 | ecbf61d90807 |
--- a/tests/test-evolve.t Fri Aug 31 09:19:13 2018 +0200 +++ b/tests/test-evolve.t Fri Aug 31 09:20:21 2018 +0200 @@ -639,7 +639,7 @@ $ echo 3 > 1 $ hg resolve -m 1 (no more unresolved files) - continue: hg grab --continue + continue: hg pick --continue $ hg grab --continue $ glog --hidden @ 8:fb2c0f0a0c54@default(draft) conflict