comparison tests/test-merge.py @ 148:c1b966866ed7

hglib: make all imports absolute (issue4520)
author Brett Cannon <brett@python.org>
date Fri, 13 Mar 2015 14:46:13 -0400
parents 4359cabcb0cc
children 8c4d24b58c23
comparison
equal deleted inserted replaced
147:98829bf71f10 148:c1b966866ed7
1 import common, hglib 1 from tests import common
2 import hglib
2 from hglib.util import b 3 from hglib.util import b
3 4
4 class test_merge(common.basetest): 5 class test_merge(common.basetest):
5 def setUp(self): 6 def setUp(self):
6 common.basetest.setUp(self) 7 common.basetest.setUp(self)