mercurial/filemerge.py

6015:26ef792f834e

    # HGMERGE takes precedence
    if os.environ.get("HGMERGE"):
        return os.environ.get("HGMERGE")

    # then patterns
    for pattern, tool in ui.configitems("merge-patterns"):
        mf = util.matcher(repo.root, "", [pat], [], [])[1]
        if mf(path) and check(tool, pat, symlink, False):
                return tool

    # then merge tools

6016:288ec2f6faa2

    # HGMERGE takes precedence
    if os.environ.get("HGMERGE"):
        return os.environ.get("HGMERGE")

    # then patterns
    for pat, tool in ui.configitems("merge-patterns"):
        mf = util.matcher(repo.root, "", [pat], [], [])[1]
        if mf(path) and check(tool, pat, symlink, False):
                return tool

    # then merge tools