.arcconfig
author Martin von Zweigbergk <martinvonz@google.com>
Mon, 14 Feb 2022 22:49:03 -0800
changeset 48788 f90337706ce7
parent 44128 ff396501e841
permissions -rw-r--r--
filemerge: make `_maketempfiles()` more reusable `_maketempfiles()` is very specialized for its current use. I hope to use it also when creating temporary files for input for tools that do partial conflict resolution. That'll be possible if the function is more generic. Instead of passing in two contexts (for "other" and "base") and an optional path (for "local"), let's pass a single list of files to make backups for. Even if we don't end up using for partial conflict resolution, this is still a simplification (but I do have a WIP patch for partial conflict resolution and it is able to benefit from this). Differential Revision: https://phab.mercurial-scm.org/D12193

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