Mercurial > hg
view .arcconfig @ 42804:7b80ad5af239
merge: hint about using `hg resolve` for resolving conflicts
This was suggested by one of our users at Google. Makes sense to me.
Differential Revision: https://phab.mercurial-scm.org/D6755
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 21 Aug 2019 13:14:39 -0700 |
parents | b2c27d84f05c |
children | ff396501e841 |
line wrap: on
line source
{ "conduit_uri": "https://phab.mercurial-scm.org/api", "repository.callsign": "HG", "arc.land.onto.default": "@", "base": "hg:.^" }