Mercurial > hg

view contrib/asv.conf.json @ 48431:6b1049d71c3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: make `_filemerge()` do both premerge and merge This patch removes the `premerge` argument from `_filemerge()` and makes it do both the "premerge" and "merge" steps without the caller having to call it twice. Differential Revision: https://phab.mercurial-scm.org/D11859
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 03 Dec 2021 21:41:43 -0800
parents cff0f5926797
children
line wrap: on
line source

{
    "version": 1,
    "project": "mercurial",
    "project_url": "https://mercurial-scm.org/",
    "repo": "..",
    "branches": ["default", "stable"],
    "environment_type": "virtualenv",
    "show_commit_url": "https://www.mercurial-scm.org/repo/hg/rev/",
    "benchmark_dir": "benchmarks",
    "env_dir": "../.asv/env",
    "results_dir": "../.asv/results",
    "html_dir": "../.asv/html"
}