Mercurial > hg
annotate .arcconfig @ 47916:65e3d8028f2e
dirstate: drop the `_merge` method
It only has one caller that only use one of the branch, so lets inline that
branch and clean things up further.
Differential Revision: https://phab.mercurial-scm.org/D11351
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 24 Aug 2021 21:16:48 +0200 |
parents | ff396501e841 |
children |
rev | line source |
---|---|
33583
b2c27d84f05c
phabricator: include the suggested arc config in the repo
Alex Gaynor <agaynor@mozilla.com>
parents:
diff
changeset
|
1 { |
b2c27d84f05c
phabricator: include the suggested arc config in the repo
Alex Gaynor <agaynor@mozilla.com>
parents:
diff
changeset
|
2 "conduit_uri": "https://phab.mercurial-scm.org/api", |
44128
ff396501e841
phabricator: use .arcconfig for `phabricator.url` if not set locally
Matt Harbison <matt_harbison@yahoo.com>
parents:
33583
diff
changeset
|
3 "phabricator.uri": "https://phab.mercurial-scm.org/", |
33583
b2c27d84f05c
phabricator: include the suggested arc config in the repo
Alex Gaynor <agaynor@mozilla.com>
parents:
diff
changeset
|
4 "repository.callsign": "HG", |
b2c27d84f05c
phabricator: include the suggested arc config in the repo
Alex Gaynor <agaynor@mozilla.com>
parents:
diff
changeset
|
5 "arc.land.onto.default": "@", |
b2c27d84f05c
phabricator: include the suggested arc config in the repo
Alex Gaynor <agaynor@mozilla.com>
parents:
diff
changeset
|
6 "base": "hg:.^" |
b2c27d84f05c
phabricator: include the suggested arc config in the repo
Alex Gaynor <agaynor@mozilla.com>
parents:
diff
changeset
|
7 } |