tests/test-update-branches.t
changeset 49456 cdfba684b6a1
parent 48689 fbf7e383e961
equal deleted inserted replaced
49455:744b341782f4 49456:cdfba684b6a1
   631   # 
   631   # 
   632   #     a
   632   #     a
   633   # 
   633   # 
   634   # To mark files as resolved:  hg resolve --mark FILE
   634   # To mark files as resolved:  hg resolve --mark FILE
   635   
   635   
       
   636   $ hg status -T '{status} {path} - {relpath(path)}\n'
       
   637   M foo - foo
       
   638    a - a
       
   639 
   636   $ hg status -Tjson
   640   $ hg status -Tjson
   637   [
   641   [
   638    {
   642    {
   639     "itemtype": "file",
   643     "itemtype": "file",
   640     "path": "foo",
   644     "path": "foo",