Mercurial > evolve
comparison tests/test-evolve.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 | 9c025ec4af88 |
comparison
equal
deleted
inserted
replaced
| 3936:537fd9a86c06 | 4002:21eab0a99841 |
|---|---|
| 1507 | | 1507 | |
| 1508 o 41:34ae045ec400@default(draft) amended | 1508 o 41:34ae045ec400@default(draft) amended |
| 1509 | | 1509 | |
| 1510 | x 40:e88bee38ffc2@default(draft) temporary amend commit for 36030b147271 | 1510 | x 40:e88bee38ffc2@default(draft) temporary amend commit for 36030b147271 |
| 1511 | | | 1511 | | |
| 1512 | | o 39:02e943732647@default(draft) will cause conflict at evolve | 1512 | | @ 39:02e943732647@default(draft) will cause conflict at evolve |
| 1513 | | | | 1513 | | | |
| 1514 | | x 38:f8e30e9317aa@default(draft) will be evolved safely | 1514 | | x 38:f8e30e9317aa@default(draft) will be evolved safely |
| 1515 | |/ | 1515 | |/ |
| 1516 | x 37:36030b147271@default(draft) will be amended | 1516 | x 37:36030b147271@default(draft) will be amended |
| 1517 |/ | 1517 |/ |