Mercurial > evolve
diff tests/test-tutorial.t @ 4074:eb4d07a0b19f mercurial-4.6
test-compat: merge stable into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 03 Sep 2018 21:59:24 +0200 |
| parents | ecbf61d90807 |
| children | f9a850018daa ef22eef37ecc |
line wrap: on
line diff
--- a/tests/test-tutorial.t Tue Aug 28 11:24:49 2018 +0200 +++ b/tests/test-tutorial.t Mon Sep 03 21:59:24 2018 +0200 @@ -664,8 +664,8 @@ $ 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" + $ hg pick fac207dec9f5 # moving "SPAM SPAM" to the working directory parent + picking 9:fac207dec9f5 "SPAM SPAM" merging shopping $ hg log -G @ 57e9caedbcb8 (draft): SPAM SPAM @@ -806,8 +806,8 @@ for simplicity sake we get the bathroom change in line again - $ hg grab 10b8aeaa8cc8 - grabbing 8:10b8aeaa8cc8 "bathroom stuff" + $ hg pick 10b8aeaa8cc8 + picking 8:10b8aeaa8cc8 "bathroom stuff" merging shopping $ hg phase --draft . $ hg log -G