tests/test-conflict.t

--- a/tests/test-conflict.t	Mon Dec 09 18:15:38 2019 -0800
+++ b/tests/test-conflict.t	Mon Dec 09 22:06:55 2019 -0800
@@ -64,7 +64,8 @@
   [
    {
     "path": "a",
-    "status": "M"
+    "status": "M",
+    "unresolved": true
    },
    {
     "path": "a.orig",