Mercurial > evolve
comparison tests/test-evolve-phase.t @ 3930:d00f0c369bc7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 02:47:44 +0200 |
| parents | 19ec729f3ca2 629558d09898 |
| children | 537fd9a86c06 684cc3418ecd |
comparison
equal
deleted
inserted
replaced
| 3929:e709e3817d7e | 3930:d00f0c369bc7 |
|---|---|
| 73 1 new orphan changesets | 73 1 new orphan changesets |
| 74 | 74 |
| 75 $ hg glog | 75 $ hg glog |
| 76 @ 3 - 87495ea7c9ec b (draft) | 76 @ 3 - 87495ea7c9ec b (draft) |
| 77 | | 77 | |
| 78 | * 2 - 13833940840c c (secret) | 78 | o 2 - 13833940840c c (secret) |
| 79 | | | 79 | | |
| 80 | x 1 - 1e6c11564562 b (draft) | 80 | x 1 - 1e6c11564562 b (draft) |
| 81 |/ | 81 |/ |
| 82 o 0 - cb9a9f314b8b a (draft) | 82 o 0 - cb9a9f314b8b a (draft) |
| 83 | 83 |
| 101 +>>>>>>> evolving: 13833940840c - test: c | 101 +>>>>>>> evolving: 13833940840c - test: c |
| 102 | 102 |
| 103 $ hg glog | 103 $ hg glog |
| 104 @ 3 - 87495ea7c9ec b (draft) | 104 @ 3 - 87495ea7c9ec b (draft) |
| 105 | | 105 | |
| 106 | * 2 - 13833940840c c (secret) | 106 | o 2 - 13833940840c c (secret) |
| 107 | | | 107 | | |
| 108 | x 1 - 1e6c11564562 b (draft) | 108 | x 1 - 1e6c11564562 b (draft) |
| 109 |/ | 109 |/ |
| 110 o 0 - cb9a9f314b8b a (draft) | 110 o 0 - cb9a9f314b8b a (draft) |
| 111 | 111 |