Mercurial > hg

view .arcconfig @ 45271:7fc3c5fbc65f stable 5.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: fix BC breakage introduced because of removal of a merge record In fcd0cff3400a I removed the usage of RECORD_RESOLVED_OTHER. However I also removed the reading support, hence if there is any user who runs into merge conflict with older version of hg, upgrades hg and then tries to read mergestate, they will end up with an MergeRecordUnsupportedError.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 01 Aug 2020 18:39:28 +0530
parents ff396501e841
children
line wrap: on
line source

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