mercurial/__init__.py
author Pulkit Goyal <7895pulkit@gmail.com>
Fri, 02 Oct 2020 18:40:39 +0530
changeset 45630 588068d5f2da
parent 43106 d783f945a701
child 48875 6000f5b25c9b
permissions -rw-r--r--
merge: check for conflicting actions irrespective of length of bids We should for whether bids contain a combination of actions which conflict with each other. Since right now we only have couple of such combination, and combinations also consist of two actions, we were checking for them only when length of bids is 2. Let's check that irrespective of the length of bids.

# __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