Mercurial > evolve
changeset 6107:cb5e056048d0
tests: update for _filemerge() doing both premerges and merges
CORE-TEST-OUTPUT-UPDATE: 6b1049d71c3e
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 10 Dec 2021 13:34:40 +0300 |
| parents | 0c052cf84944 |
| children | ed68f64f5d0f |
| files | tests/test-evolve-progress.t |
| diffstat | 1 files changed, 0 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-progress.t Fri Dec 10 13:29:16 2021 +0300 +++ b/tests/test-evolve-progress.t Fri Dec 10 13:34:40 2021 +0300 @@ -129,8 +129,6 @@ 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')