Mercurial > evolve
comparison tests/test-stabilize-result.t @ 1003:574315ec19c2
test: adapt to upstream message change
A message gained parenthesis in 3.1 we reflect than in the test.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 29 Jul 2014 17:15:01 -0700 |
| parents | b286f77d680c |
| children | 0fcddde7dae6 |
comparison
equal
deleted
inserted
replaced
| 1002:195642c1520b | 1003:574315ec19c2 |
|---|---|
| 93 $ hg evolve --continue | 93 $ hg evolve --continue |
| 94 grafting revision 5 | 94 grafting revision 5 |
| 95 abort: unresolved merge conflicts (see hg help resolve) | 95 abort: unresolved merge conflicts (see hg help resolve) |
| 96 [255] | 96 [255] |
| 97 $ hg resolve -m a | 97 $ hg resolve -m a |
| 98 no more unresolved files | 98 (no more unresolved files) |
| 99 $ hg evolve --continue | 99 $ hg evolve --continue |
| 100 grafting revision 5 | 100 grafting revision 5 |
| 101 | 101 |
| 102 Stabilize latecomer with different parent | 102 Stabilize latecomer with different parent |
| 103 ========================================= | 103 ========================================= |