tests/test-conflict.t

43859:fb4a6d584756

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

43860:7315464f0613

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