Mercurial > hg
view .arcconfig @ 48425:9e1f174d305b
simplemerge: set `conflicts` earlier for :union tool
Differential Revision: https://phab.mercurial-scm.org/D11853
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 29 Nov 2021 23:00:29 -0800 |
parents | ff396501e841 |
children |
line wrap: on
line source
{ "conduit_uri": "https://phab.mercurial-scm.org/api", "phabricator.uri": "https://phab.mercurial-scm.org/", "repository.callsign": "HG", "arc.land.onto.default": "@", "base": "hg:.^" }