Mercurial > hg
diff tests/test-conflict.t @ 43861:aac921f54554
status: outputting structured unfinished-operation information
This adds a new item in the json/template output for morestatus and added item
types to all entries.
Differential Revision: https://phab.mercurial-scm.org/D7595
author | Rodrigo Damazio Bovendorp <rdamazio@google.com> |
---|---|
date | Mon, 09 Dec 2019 22:24:58 -0800 |
parents | 7315464f0613 |
children | 40411ad2f5d2 |
line wrap: on
line diff
--- a/tests/test-conflict.t Thu Dec 05 14:28:21 2019 -0800 +++ b/tests/test-conflict.t Mon Dec 09 22:24:58 2019 -0800 @@ -63,13 +63,20 @@ $ hg status -Tjson [ { + "itemtype": "file", "path": "a", "status": "M", "unresolved": true }, { + "itemtype": "file", "path": "a.orig", "status": "?" + }, + { + "itemtype": "morestatus", + "unfinished": "merge", + "unfinishedmsg": "To continue: hg commit\nTo abort: hg merge --abort" } ]