# HG changeset patch # User Yuya Nishihara # Date 2018-09-15 12:28:47 # Node ID e7ae31199ff9882d01a213c8d8c2592f92eccdfe # Parent c0c703861b60974ef6cd491c2a942bf908c2f3d6 tests: show that the structure of the more status output looks weird Each dict should represent data of the same kind. diff --git a/tests/test-conflict.t b/tests/test-conflict.t --- a/tests/test-conflict.t +++ b/tests/test-conflict.t @@ -60,6 +60,22 @@ # To continue: hg commit # To abort: hg merge --abort + $ hg status -Tjson + [ + { + "path": "a", + "status": "M" + }, + { + "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" + } + ] $ cat a Small Mathematical Series.