diff -r 2a3c0106ded9 -r 3a7efcbdf288 tests/test-rename-merge1.t
--- a/tests/test-rename-merge1.t	Fri Apr 12 12:20:38 2019 -0400
+++ b/tests/test-rename-merge1.t	Fri Apr 12 09:41:08 2019 -0700
@@ -37,8 +37,8 @@
    branchmerge: True, force: False, partial: False
    ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c
   note: possible conflict - a2 was renamed multiple times to:
+   b2
    c2
-   b2
    preserving a for resolve of b
   removing a
    b2: remote created -> g