Mercurial > evolve
changeset 6175:d03f682938ae mercurial-6.0
test-compat: back out changeset cb5e056048d0
CORE-TEST-OUTPUT-UPDATE: 6b1049d71c3e
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 22 Feb 2022 07:13:41 +0300 |
| parents | bd2c42680dff |
| children | 32faf1cd209f |
| files | tests/test-evolve-progress.t |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-progress.t Tue Feb 22 07:03:00 2022 +0300 +++ b/tests/test-evolve-progress.t Tue Feb 22 07:13:41 2022 +0300 @@ -129,6 +129,8 @@ picked tool ':merge' for a (binary False symlink False changedelete False) merging a my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b + picked tool ':merge' for a (binary False symlink False changedelete False) + my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted')