Mercurial > python-hglib

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/tests/test-merge.py	Fri Mar 13 12:28:06 2015 -0500
+++ b/tests/test-merge.py	Fri Mar 13 14:46:13 2015 -0400
@@ -1,4 +1,5 @@
-import common, hglib
+from tests import common
+import hglib
 from hglib.util import b
 
 class test_merge(common.basetest):