Mercurial > evolve
comparison tests/test-unstability-resolution-result.t @ 5716:a4e50b74747e stable
tests: update exit code in case of unresolved merge conflicts
CORE-TEST-OUTPUT-UPDATE: fa87536d3d70
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 02 Dec 2020 09:55:33 +0800 |
| parents | b3d9e6c805d6 |
| children | 8e4f6354b316 a1dad44fe3da |
comparison
equal
deleted
inserted
replaced
| 5715:2238dd83c5b3 | 5716:a4e50b74747e |
|---|---|
| 102 a | 102 a |
| 103 +a | 103 +a |
| 104 +newer a | 104 +newer a |
| 105 $ hg evolve --continue | 105 $ hg evolve --continue |
| 106 abort: unresolved merge conflicts (see 'hg help resolve') | 106 abort: unresolved merge conflicts (see 'hg help resolve') |
| 107 [255] | 107 [20] |
| 108 $ hg resolve -m a | 108 $ hg resolve -m a |
| 109 (no more unresolved files) | 109 (no more unresolved files) |
| 110 continue: hg evolve --continue | 110 continue: hg evolve --continue |
| 111 $ hg evolve --continue | 111 $ hg evolve --continue |
| 112 evolving 4:3655f0f50885 "newer a" | 112 evolving 4:3655f0f50885 "newer a" |