tests/test-rename-merge1.t
changeset 45488 c4f14db3da1d
parent 44237 b4057d001760
child 46072 69429972ff1f
--- a/tests/test-rename-merge1.t	Thu Jun 25 13:16:55 2020 +0530
+++ b/tests/test-rename-merge1.t	Thu Sep 03 13:25:29 2020 +0530
@@ -40,10 +40,10 @@
   note: possible conflict - a2 was renamed multiple times to:
    b2
    c2
+   b2: remote created -> g
+  getting b2
    preserving a for resolve of b
   removing a
-   b2: remote created -> g
-  getting b2
    b: remote moved from a -> m (premerge)
   picked tool ':merge' for b (binary False symlink False changedelete False)
   merging a and b to b