Mercurial > evolve
comparison tests/test-evolve-phase.t @ 4002:21eab0a99841 mercurial-4.3
test-compat: merge mercurial-4.4 into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 21 Aug 2018 14:09:33 +0200 |
| parents | 537fd9a86c06 684cc3418ecd |
| children |
comparison
equal
deleted
inserted
replaced
| 3936:537fd9a86c06 | 4002:21eab0a99841 |
|---|---|
| 101 +>>>>>>> evolving: 13833940840c - test: c | 101 +>>>>>>> evolving: 13833940840c - test: c |
| 102 | 102 |
| 103 $ hg glog | 103 $ hg glog |
| 104 @ 4 - 87495ea7c9ec b (draft) | 104 @ 4 - 87495ea7c9ec b (draft) |
| 105 | | 105 | |
| 106 | o 2 - 13833940840c c (secret) | 106 | @ 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 |