Mercurial > hg
view .arcconfig @ 34558:f71c712ebdec
tests: add test for path conflicts during merge
Differential Revision: https://phab.mercurial-scm.org/D787
author | Mark Thomas <mbthomas@fb.com> |
---|---|
date | Mon, 02 Oct 2017 14:05:30 -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:.^" }