tests/test-conflict.t

39736:e7ae31199ff9

    "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.

39737:fd805a44b89d

    "status": "M"
   },
   {
    "path": "a.orig",
    "status": "?"
   }
  ]

  $ cat a
  Small Mathematical Series.