comparison tests/test-conflict.t @ 43842:7315464f0613

status: add template/json data about whether a file has unresolved conflicts

Differential Revision: https://phab.mercurial-scm.org/D7594

43841:fb4a6d584756

  
  $ hg status -Tjson
  [
   {
    "path": "a",
    "status": "M"
   },
   {
    "path": "a.orig",
    "status": "?"
   }

43842:7315464f0613

  
  $ hg status -Tjson
  [
   {
    "path": "a",
    "status": "M",
    "unresolved": true
   },
   {
    "path": "a.orig",
    "status": "?"
   }