Mercurial > evolve
comparison tests/test-stabilize-conflict.t @ 3419:1e2f683e11e7 mercurial-4.2
test-compat: merge mercurial-4.3 into mercurial-4.2
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 16 Jan 2018 04:38:04 +0100 |
| parents | 3e2abd40da07 85cdce113c2c |
| children | 7a5c3175015e |
comparison
equal
deleted
inserted
replaced
| 3381:16b4f0e32d9d | 3419:1e2f683e11e7 |
|---|---|
| 165 reverting babar | 165 reverting babar |
| 166 $ safesed 's/dix/ten/' babar | 166 $ safesed 's/dix/ten/' babar |
| 167 $ hg resolve --all -m | 167 $ hg resolve --all -m |
| 168 (no more unresolved files) | 168 (no more unresolved files) |
| 169 $ hg evolve --continue | 169 $ hg evolve --continue |
| 170 grafting 5:71c18f70c34f "babar count up to fifteen" | 170 evolving 5:71c18f70c34f "babar count up to fifteen" |
| 171 $ hg resolve -l | 171 $ hg resolve -l |
| 172 $ hg log -G | 172 $ hg log -G |
| 173 @ changeset: 8:1836b91c6c1d | 173 @ changeset: 8:1836b91c6c1d |
| 174 | tag: tip | 174 | tag: tip |
| 175 | user: test | 175 | user: test |