tests/test-graft.t
changeset 45488 c4f14db3da1d
parent 44906 e5043679bfcc
child 45827 8d72e29ad1e0
--- a/tests/test-graft.t	Thu Jun 25 13:16:55 2020 +0530
+++ b/tests/test-graft.t	Thu Sep 03 13:25:29 2020 +0530
@@ -247,9 +247,9 @@
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
-   preserving e for resolve of e
    d: remote is newer -> g
   getting d
+   preserving e for resolve of e
    e: versions differ -> m (premerge)
   picked tool ':merge' for e (binary False symlink False changedelete False)
   merging e