tests/test-rebase-transaction.t

--- a/tests/test-rebase-transaction.t	Fri Jan 10 14:17:56 2020 -0800
+++ b/tests/test-rebase-transaction.t	Fri Jan 10 14:22:20 2020 -0800
@@ -114,7 +114,7 @@
   |
   | @  4: Z
   | |
-  @ |  3: C
+  % |  3: C
   | |
   | o  2: Y
   | |
@@ -123,9 +123,9 @@
   o  0: A
   
   $ hg st
-  M C
   M conflict
   A B
+  A C
   ? conflict.orig
   $ echo resolved > conflict
   $ hg resolve -m