Mercurial > evolve
diff tests/test-tutorial.t @ 1107:1c227ecb744d
merge: all the stable sweetness into default
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 02 Sep 2014 20:11:45 +0200 |
| parents | 85c699c4fba4 bac4e0bc9f6a |
| children | 6328e005b6c8 |
line wrap: on
line diff
--- a/tests/test-tutorial.t Fri Aug 29 16:13:19 2014 +0200 +++ b/tests/test-tutorial.t Tue Sep 02 20:11:45 2014 +0200 @@ -703,6 +703,7 @@ move:[15] animals atop:[14] bathroom stuff merging shopping + working directory is now at ee942144f952 The old version of bathroom is hidden again. @@ -754,6 +755,7 @@ $ hg evolve update:[8] animals 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + working directory is now at ee942144f952 Relocating unstable change after prune ---------------------------------------------- @@ -831,6 +833,7 @@ move:[17] SPAM SPAM SPAM atop:[14] bathroom stuff merging shopping + working directory is now at 40aa40daeefb $ hg log -G @ 40aa40daeefb (draft): SPAM SPAM SPAM