view .arcconfig @ 45619:e8078af6af30

merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED

ACTION_KEEP_NEW and ACTION_CHANGED_DELETED are conflicting actions as one says
that file is new while other says that file was present earlier and has
changed-delete conflicts.

Let's do changed-delete which will lead to conflicts and make user choose the
right way.

{
    "conduit_uri": "https://phab.mercurial-scm.org/api",
    "phabricator.uri": "https://phab.mercurial-scm.org/",
    "repository.callsign": "HG",
    "arc.land.onto.default": "@",
    "base": "hg:.^"
}