--- a/tests/test-convert-filemap.t	Sat Jul 13 23:45:32 2019 -0400
+++ b/tests/test-convert-filemap.t	Tue Jul 02 12:59:58 2019 -0400
@@ -760,9 +760,8 @@
   converted/b
   x
   $ hg -R merge-test2 log -G -T '{shortest(node)} {desc}\n{files % "- {file}\n"}\n'
-  o    6eaa merge a & b
+  o    e2ff merge a & b
   |\   - converted/a
-  | |  - toberemoved
   | |
   | o  2995 add b
   | |  - converted/b