Mercurial > hg-stable

diff tests/test-conflict.t @ 39753:fd805a44b89d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
status: remove "morestatus" message from formatter data (BC) They are just printable messages, not data that should be fed to JSON or templater.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 15 Sep 2018 21:35:36 +0900
parents e7ae31199ff9
children 7315464f0613
line wrap: on
line diff
--- 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"
    }
   ]