diff tests/test-update-branches.t @ 43939:07ebb567e8bb

status: make unresolved files always be in the morestatus structured output

We don't know the status of those files, only that they're unresolved, so
we don't output the status for those - any code parsing this will have to be
tolerant to that.

Differential Revision: https://phab.mercurial-scm.org/D7668

--- a/tests/test-update-branches.t	Wed Dec 18 23:43:21 2019 -0800
+++ b/tests/test-update-branches.t	Wed Dec 18 23:45:11 2019 -0800
@@ -591,6 +591,11 @@
     "itemtype": "file",
     "path": "foo",
     "status": "M"
+   },
+   {
+    "itemtype": "file",
+    "path": "a",
+    "unresolved": true
    }
   ]