Mercurial > evolve
comparison tests/test-stabilize-conflict.t @ 1026:35adaf02b777 stable
test: apply message changes introduced by mercurial 3.1
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 08 Aug 2014 10:40:47 -0700 |
| parents | 17ac69db9329 |
| children | 0fcddde7dae6 |
comparison
equal
deleted
inserted
replaced
| 1025:b96c9af18453 | 1026:35adaf02b777 |
|---|---|
| 162 | 162 |
| 163 $ hg revert -r 5 --all | 163 $ hg revert -r 5 --all |
| 164 reverting babar | 164 reverting babar |
| 165 $ safesed 's/dix/ten/' babar | 165 $ safesed 's/dix/ten/' babar |
| 166 $ hg resolve --all -m | 166 $ hg resolve --all -m |
| 167 (no more unresolved files) | |
| 167 $ hg evolve --continue | 168 $ hg evolve --continue |
| 168 grafting revision 5 | 169 grafting revision 5 |
| 169 $ hg resolve -l | 170 $ hg resolve -l |
| 170 $ hg log -G | 171 $ hg log -G |
| 171 @ changeset: 8:1836b91c6c1d | 172 @ changeset: 8:1836b91c6c1d |