view .arcconfig @ 44342:7f7c8521e9bd

tests: add test of rebase with conflict in merge commit

It doesn't seem like we had any tests of this. I think it's pretty
weird that the two parents we're merging are not the working copy
parents during the conflict resolution.

Differential Revision: https://phab.mercurial-scm.org/D7824

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