Mercurial > hg
changeset 44375:35d2afc6966a
tests: stabilize test-rename-merge2.t on Windows
I have no idea why, but this shifted in b4057d001760.
Differential Revision: https://phab.mercurial-scm.org/D8146
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Mon, 24 Feb 2020 16:59:35 -0500 |
| parents | f5c006621f07 |
| children | 56f089e40c5a |
| files | tests/test-rename-merge2.t |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rename-merge2.t Mon Feb 24 13:50:55 2020 -0500 +++ b/tests/test-rename-merge2.t Mon Feb 24 16:59:35 2020 -0500 @@ -722,8 +722,8 @@ ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a preserving b for resolve of b preserving rev for resolve of rev + starting 4 threads for background file closing (?) b: both renamed from a -> m (premerge) - starting 4 threads for background file closing (?) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) merging b my b@0b76e65c8289+ other b@bdb19105162a ancestor a@924404dff337