Mercurial > evolve
comparison tests/test-unstability-resolution-result.t @ 5749:0095a5240db5 mercurial-5.6
tests: back out changeset a4e50b74747e
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 28 Jan 2021 18:48:37 +0800 |
| parents | 8e4f6354b316 |
| children | fd039a7f0c3c |
comparison
equal
deleted
inserted
replaced
| 5748:860f72732052 | 5749:0095a5240db5 |
|---|---|
| 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 [20] | 107 [255] |
| 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" |