--- a/tests/test-backout.t Wed Sep 30 21:22:31 2015 -0700
+++ b/tests/test-backout.t Fri Oct 02 13:00:47 2015 -0700
@@ -593,6 +593,23 @@
use 'hg resolve' to retry unresolved file merges
[1]
$ hg status
+ $ hg debugmergestate
+ * version 2 records
+ local: b71750c4b0fdf719734971e3ef90dbeab5919a2d
+ other: a30dd8addae3ce71b8667868478542bc417439e6
+ file: foo (state "u", hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33)
+ local path: foo (flags "")
+ ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708)
+ other path: foo (node f50039b486d6fa1a90ae51778388cad161f425ee)
+ $ mv .hg/merge/state2 .hg/merge/state2-moved
+ $ hg debugmergestate
+ * version 1 records
+ local: b71750c4b0fdf719734971e3ef90dbeab5919a2d
+ file: foo (state "u", hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33)
+ local path: foo (flags "")
+ ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708)
+ other path: foo (node not stored in v1 format)
+ $ mv .hg/merge/state2-moved .hg/merge/state2
$ hg resolve -l # still unresolved
U foo
$ hg summary