Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-issue672.t
changeset 46072 69429972ff1f
parent 44197 17e12938f8e7
child 48427 38941a28406a 
--- a/tests/test-issue672.t	Mon Dec 07 20:57:50 2020 -0500
+++ b/tests/test-issue672.t	Mon Dec 07 20:32:05 2020 -0500
@@ -63,8 +63,8 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96
+  starting 4 threads for background file closing (?)
    preserving 1a for resolve of 1a
-  starting 4 threads for background file closing (?)
    1a: local copied/moved from 1 -> m (premerge)
   picked tool ':merge' for 1a (binary False symlink False changedelete False)
   merging 1a and 1 to 1a
@@ -86,9 +86,9 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b
+  starting 4 threads for background file closing (?)
    preserving 1 for resolve of 1a
   removing 1
-  starting 4 threads for background file closing (?)
    1a: remote moved from 1 -> m (premerge)
   picked tool ':merge' for 1a (binary False symlink False changedelete False)
   merging 1 and 1a to 1a
mercurial