view mercurial/__init__.py @ 45283:f1fb9a079131

merge: add removefile() to mergeresult object There are cases where some further calculation makes the file not needing to be merged anymore and hence needs to be dropped in mergeresult object. This adds a function for that. Differential Revision: https://phab.mercurial-scm.org/D8821
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 24 Jul 2020 16:23:55 +0530
parents d783f945a701
children 6000f5b25c9b
line wrap: on
line source

# __init__.py - Startup and module loading logic for Mercurial.
#
# Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

from __future__ import absolute_import

# Allow 'from mercurial import demandimport' to keep working.
import hgdemandimport

demandimport = hgdemandimport