Mercurial > hg

diff tests/test-conflict.t @ 44129:84a0102c05c7 stable 5.3rc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge to stable for 5.3 release freeze
author Augie Fackler <augie@google.com>
date Tue, 21 Jan 2020 13:14:51 -0500
parents aac921f54554
children 40411ad2f5d2
line wrap: on
line diff
--- a/tests/test-conflict.t	Thu Jan 09 14:19:20 2020 -0500
+++ b/tests/test-conflict.t	Tue Jan 21 13:14:51 2020 -0500
@@ -63,12 +63,20 @@
   $ hg status -Tjson
   [
    {
+    "itemtype": "file",
     "path": "a",
-    "status": "M"
+    "status": "M",
+    "unresolved": true
    },
    {
+    "itemtype": "file",
     "path": "a.orig",
     "status": "?"
+   },
+   {
+    "itemtype": "morestatus",
+    "unfinished": "merge",
+    "unfinishedmsg": "To continue:    hg commit\nTo abort:       hg merge --abort"
    }
   ]