tests/test-backout.t
changeset 46811 5a0b930cfb3e
parent 45827 8d72e29ad1e0
child 48372 e9d588b28710
--- a/tests/test-backout.t	Wed Mar 17 20:06:35 2021 +0100
+++ b/tests/test-backout.t	Wed Mar 10 13:14:32 2021 +0530
@@ -718,6 +718,7 @@
     ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708)
     other path: foo (node f50039b486d6fa1a90ae51778388cad161f425ee)
     extra: ancestorlinknode = 91360952243723bd5b1138d5f26bd8c8564cb553
+    extra: merged = yes
   $ mv .hg/merge/state2 .hg/merge/state2-moved
   $ hg debugmergestate -v
   no version 2 merge state