Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: stabilize test-rename-merge2.t on Windows
authorMatt Harbison <matt_harbison@yahoo.com>
Mon, 24 Feb 2020 16:59:35 -0500
changeset 44408 35d2afc6966a
parent 44407 f5c006621f07
child 44409 56f089e40c5a
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
tests/test-rename-merge2.t file | annotate | diff | comparison | revisions 
--- 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
hg-stable