Mercurial > evolve
diff tests/test-tutorial.t @ 4049:25981fae92f9
pick: update command output to mention pick instead of grab
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 31 Aug 2018 09:13:11 +0200 |
| parents | a03bb02dfaba |
| children | ecbf61d90807 |
line wrap: on
line diff
--- a/tests/test-tutorial.t Fri Aug 31 09:11:04 2018 +0200 +++ b/tests/test-tutorial.t Fri Aug 31 09:13:11 2018 +0200 @@ -665,7 +665,7 @@ $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent - grabbing 9:fac207dec9f5 "SPAM SPAM" + picking 9:fac207dec9f5 "SPAM SPAM" merging shopping $ hg log -G @ 57e9caedbcb8 (draft): SPAM SPAM @@ -807,7 +807,7 @@ for simplicity sake we get the bathroom change in line again $ hg grab 10b8aeaa8cc8 - grabbing 8:10b8aeaa8cc8 "bathroom stuff" + picking 8:10b8aeaa8cc8 "bathroom stuff" merging shopping $ hg phase --draft . $ hg log -G