Mercurial > evolve
comparison tests/test-evolve-issue5967.t @ 5892:34cd08a46b6d mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sat, 24 Apr 2021 20:01:39 +0800 |
| parents | 8e4f6354b316 |
| children |
comparison
equal
deleted
inserted
replaced
| 5891:b13cb2d500ae | 5892:34cd08a46b6d |
|---|---|
| 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 |