Mercurial > evolve
comparison tests/test-issue-5720.t @ 6809:9903ee44e658 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 26 Jun 2024 18:09:37 +0400 |
| parents | 8e4f6354b316 |
| children |
comparison
equal
deleted
inserted
replaced
| 6808:c7d3e1d8c6f1 | 6809:9903ee44e658 |
|---|---|
| 61 atop:[3] b | 61 atop:[3] b |
| 62 merging a | 62 merging a |
| 63 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 63 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 64 unresolved merge conflicts | 64 unresolved merge conflicts |
| 65 (see 'hg help evolve.interrupted') | 65 (see 'hg help evolve.interrupted') |
| 66 [240] | 66 [1] |
| 67 | 67 |
| 68 Fix the conflict | 68 Fix the conflict |
| 69 $ echo c2 > a | 69 $ echo c2 > a |
| 70 $ hg resolve -m | 70 $ hg resolve -m |
| 71 (no more unresolved files) | 71 (no more unresolved files) |