Mercurial > hg
annotate .arcconfig @ 43738:558f7585afcb stable
test: don't put $BINDIR in $PATH for test-merge-tools.t
We call $BINDIR/hg explicitly anyway, so don't need it in $PATH. This
fixes failures when running the test --with-hg=/usr/bin/hg, where we
pick up /usr/bin/false as merge tool when we expected not to find it.
author | Julien Cristau <jcristau@debian.org> |
---|---|
date | Fri, 29 Nov 2019 18:49:59 +0100 |
parents | b2c27d84f05c |
children | ff396501e841 |
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", |
b2c27d84f05c
phabricator: include the suggested arc config in the repo
Alex Gaynor <agaynor@mozilla.com>
parents:
diff
changeset
|
3 "repository.callsign": "HG", |
b2c27d84f05c
phabricator: include the suggested arc config in the repo
Alex Gaynor <agaynor@mozilla.com>
parents:
diff
changeset
|
4 "arc.land.onto.default": "@", |
b2c27d84f05c
phabricator: include the suggested arc config in the repo
Alex Gaynor <agaynor@mozilla.com>
parents:
diff
changeset
|
5 "base": "hg:.^" |
b2c27d84f05c
phabricator: include the suggested arc config in the repo
Alex Gaynor <agaynor@mozilla.com>
parents:
diff
changeset
|
6 } |