Mercurial > evolve
diff tests/test-grab.t @ 4052:73e73471d6c6
pick: replace "grabstate" with "pickstate"
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 31 Aug 2018 09:20:21 +0200 |
| parents | 25981fae92f9 |
| children | ecbf61d90807 |
line wrap: on
line diff
--- a/tests/test-grab.t Fri Aug 31 09:19:13 2018 +0200 +++ b/tests/test-grab.t Fri Aug 31 09:20:21 2018 +0200 @@ -174,7 +174,7 @@ $ echo foobar > c $ hg resolve --all --mark (no more unresolved files) - continue: hg grab --continue + continue: hg pick --continue $ hg grab --continue $ hg glog @ 8:44e155eb95c7 add c @@ -211,7 +211,7 @@ $ echo foobar > c $ hg resolve -m (no more unresolved files) - continue: hg grab --continue + continue: hg pick --continue $ hg grab --continue note: picking 9:4e04628911f6 created no changes to commit @@ -293,7 +293,7 @@ $ echo bar > b $ hg resolve -m (no more unresolved files) - continue: hg grab --continue + continue: hg pick --continue $ hg grab --continue $ hg phase -r .