tests/test-rebase-abort.t

--- a/tests/test-rebase-abort.t	Wed Mar 17 20:06:35 2021 +0100
+++ b/tests/test-rebase-abort.t	Wed Mar 10 13:14:32 2021 +0530
@@ -95,6 +95,7 @@
     ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6)
     other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5)
     extra: ancestorlinknode = 3163e20567cc93074fbb7a53c8b93312e59dbf2c
+    extra: merged = yes
   $ hg resolve -l
   U common