annotate hgext3rd/__init__.py @ 3430:14fbb847be5a

test: update output for new `merge --abort` message Core have updated its command to cancel a failed merge, update the test output to match it. CORE-TEST-OUTPUT-UPDATE: 41ef02ba329b
author Boris Feld <boris.feld@octobus.net>
date Fri, 19 Jan 2018 19:18:05 +0100
parents 143c8e4dc22d
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
1 # name space package to host third party extensions
1901
85390446f8c1 packaging: fix setup.py and install as hgext3rd.topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
2 from __future__ import absolute_import
85390446f8c1 packaging: fix setup.py and install as hgext3rd.topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
3 import pkgutil
85390446f8c1 packaging: fix setup.py and install as hgext3rd.topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
4 __path__ = pkgutil.extend_path(__path__, __name__)