Mercurial > evolve
comparison tests/test-evolve-issue5967.t @ 5747:8e4f6354b316 mercurial-5.6
tests: back out changeset b3d9e6c805d6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 28 Jan 2021 18:48:36 +0800 |
| parents | 61d2f1cf90f0 |
| children |
comparison
equal
deleted
inserted
replaced
| 5746:feb28638ec6c | 5747:8e4f6354b316 |
|---|---|
| 41 atop:[2] apricot | 41 atop:[2] apricot |
| 42 merging a | 42 merging a |
| 43 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 43 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 44 unresolved merge conflicts | 44 unresolved merge conflicts |
| 45 (see 'hg help evolve.interrupted') | 45 (see 'hg help evolve.interrupted') |
| 46 [240] | 46 [1] |
| 47 | 47 |
| 48 $ echo apricot > a | 48 $ echo apricot > a |
| 49 $ hg resolve --mark a | 49 $ hg resolve --mark a |
| 50 (no more unresolved files) | 50 (no more unresolved files) |
| 51 continue: hg evolve --continue | 51 continue: hg evolve --continue |