Mercurial > hg
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
author | Rodrigo Damazio Bovendorp <rdamazio@google.com> |
---|---|
date | Mon, 09 Dec 2019 22:06:55 -0800 |
parents | fd805a44b89d |
children | aac921f54554 |
comparison
equal
deleted
inserted
replaced
43841:fb4a6d584756 | 43842:7315464f0613 |
---|---|
62 | 62 |
63 $ hg status -Tjson | 63 $ hg status -Tjson |
64 [ | 64 [ |
65 { | 65 { |
66 "path": "a", | 66 "path": "a", |
67 "status": "M" | 67 "status": "M", |
68 "unresolved": true | |
68 }, | 69 }, |
69 { | 70 { |
70 "path": "a.orig", | 71 "path": "a.orig", |
71 "status": "?" | 72 "status": "?" |
72 } | 73 } |