--- a/tests/test-issue672.t Sat Jul 13 23:45:32 2019 -0400
+++ b/tests/test-issue672.t Tue Jul 02 12:59:58 2019 -0400
@@ -60,13 +60,13 @@
checking for directory renames
resolving manifests
branchmerge: True, force: False, partial: False
- ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96
+ ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96
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
- my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@c64f439569a9
+ my 1a@f4a9cff3cd0b+ other 1@746e9549ea96 ancestor 1@c64f439569a9
premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -82,14 +82,14 @@
checking for directory renames
resolving manifests
branchmerge: True, force: False, partial: False
- ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8
+ ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b
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
- my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@c64f439569a9
+ my 1a@746e9549ea96+ other 1a@f4a9cff3cd0b ancestor 1@c64f439569a9
premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)