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-graft.t
changeset 46072 69429972ff1f
parent 45916 fa87536d3d70
child 46650 2803f94b7431 
--- a/tests/test-graft.t	Mon Dec 07 20:57:50 2020 -0500
+++ b/tests/test-graft.t	Mon Dec 07 20:32:05 2020 -0500
@@ -210,8 +210,8 @@
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
+  starting 4 threads for background file closing (?)
    preserving b for resolve of b
-  starting 4 threads for background file closing (?)
    b: local copied/moved from a -> m (premerge)
   picked tool ':merge' for b (binary False symlink False changedelete False)
   merging b and a to b
Mercurial