Mercurial > evolve
comparison tests/test-stabilize-result.t @ 4315:55ca0b6276e7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 24 Dec 2018 17:47:31 +0100 |
| parents | f9a850018daa 4a740f9eee49 |
| children | e6ee830c4f45 a2fdbece7ce1 |
comparison
equal
deleted
inserted
replaced
| 4308:c06301c5b3e2 | 4315:55ca0b6276e7 |
|---|---|
| 91 @@ -1,1 +1,3 @@ | 91 @@ -1,1 +1,3 @@ |
| 92 a | 92 a |
| 93 +a | 93 +a |
| 94 +newer a | 94 +newer a |
| 95 $ hg evolve --continue | 95 $ hg evolve --continue |
| 96 evolving 4:3655f0f50885 "newer a" | |
| 97 abort: unresolved merge conflicts (see 'hg help resolve') | 96 abort: unresolved merge conflicts (see 'hg help resolve') |
| 98 [255] | 97 [255] |
| 99 $ hg resolve -m a | 98 $ hg resolve -m a |
| 100 (no more unresolved files) | 99 (no more unresolved files) |
| 101 continue: hg evolve --continue | 100 continue: hg evolve --continue |