Mercurial Mercurial > hg / 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-copy-move-merge.t
changeset 46072 69429972ff1f
parent 45771 f90a5c211251
child 48427 38941a28406a 
--- a/tests/test-copy-move-merge.t	Mon Dec 07 20:57:50 2020 -0500
+++ b/tests/test-copy-move-merge.t	Mon Dec 07 20:32:05 2020 -0500
@@ -100,10 +100,10 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
+  starting 4 threads for background file closing (?)
    preserving a for resolve of b
    preserving a for resolve of c
   removing a
-  starting 4 threads for background file closing (?)
    b: remote moved from a -> m (premerge)
   picked tool ':merge' for b (binary False symlink False changedelete False)
   merging a and b to b
Mercurial