view hgext3rd/__init__.py @ 4984:b779b40f996e stable

evolve: fix content-divergence resolution when p1 is null (issue6201)

Before this fix, in cases like in the added test, the revision number -1 of the
parent was misinterpreted to mean the tipmost revision instead of the null
revision, causing the content-divergence resolution to fail.

# name space package to host third party extensions
from __future__ import absolute_import
import pkgutil
__path__ = pkgutil.extend_path(__path__, __name__)