Mercurial > evolve
comparison tests/test-evolve-progress.t @ 6181:e6ae5af97683 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 22 Feb 2022 08:19:44 +0300 |
| parents | 8e4f6354b316 |
| children | 1328195f76a9 |
comparison
equal
deleted
inserted
replaced
| 6180:0042d69b8648 | 6181:e6ae5af97683 |
|---|---|
| 134 picked tool ':merge' for a (binary False symlink False changedelete False) | 134 picked tool ':merge' for a (binary False symlink False changedelete False) |
| 135 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b | 135 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b |
| 136 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 136 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 137 unresolved merge conflicts | 137 unresolved merge conflicts |
| 138 (see 'hg help evolve.interrupted') | 138 (see 'hg help evolve.interrupted') |
| 139 [240] | 139 [1] |
| 140 $ echo resolved > a | 140 $ echo resolved > a |
| 141 $ hg resolve -m a | 141 $ hg resolve -m a |
| 142 (no more unresolved files) | 142 (no more unresolved files) |
| 143 continue: hg evolve --continue | 143 continue: hg evolve --continue |
| 144 $ hg evolve --continue --config progress.debug=yes --debug | 144 $ hg evolve --continue --config progress.debug=yes --debug |