tests/test-conflict.t

--- a/tests/test-conflict.t	Thu Dec 05 14:28:21 2019 -0800
+++ b/tests/test-conflict.t	Mon Dec 09 22:24:58 2019 -0800
@@ -63,13 +63,20 @@
   $ hg status -Tjson
   [
    {
+    "itemtype": "file",
     "path": "a",
     "status": "M",
     "unresolved": true
    },
    {
+    "itemtype": "file",
     "path": "a.orig",
     "status": "?"
+   },
+   {
+    "itemtype": "morestatus",
+    "unfinished": "merge",
+    "unfinishedmsg": "To continue:    hg commit\nTo abort:       hg merge --abort"
    }
   ]