.arcconfig
author Pulkit Goyal <7895pulkit@gmail.com>
Sat, 26 May 2018 02:11:09 +0530
changeset 38155 5736570718fe
parent 33583 b2c27d84f05c
child 44128 ff396501e841
permissions -rw-r--r--
graft: drop --user and --date values info from hint in case of conflicts After previous patch, we have started preserving user and date values in graftstate and reusing them during `hg graft --continue`. Now passing --user and --date again with --continue makes no sense. Let's drop them from the hint. Differential Revision: https://phab.mercurial-scm.org/D3660
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
}