Mercurial > hg
diff 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 |
line wrap: on
line diff