tests/test-conflict.t
changeset 39753 fd805a44b89d
parent 39752 e7ae31199ff9
child 43860 7315464f0613
--- a/tests/test-conflict.t	Sat Sep 15 21:28:47 2018 +0900
+++ b/tests/test-conflict.t	Sat Sep 15 21:35:36 2018 +0900
@@ -69,11 +69,6 @@
    {
     "path": "a.orig",
     "status": "?"
-   },
-   {
-    "conflictsmsg": "# Unresolved merge conflicts:\n# \n#     a\n# \n# To mark files as resolved:  hg resolve --mark FILE\n",
-    "helpmsg": "# To continue:    hg commit\n# To abort:       hg merge --abort\n",
-    "statemsg": "# The repository is in an unfinished *merge* state.\n"
    }
   ]