--- a/tests/test-simplemerge.py	Thu Apr 14 01:37:29 2016 -0700
+++ b/tests/test-simplemerge.py	Sat Apr 16 02:59:36 2016 +0530
@@ -13,10 +13,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import absolute_import
+
 import unittest
-from unittest import TestCase
-from mercurial import util, simplemerge, error
+from mercurial import (
+    error,
+    simplemerge,
+    util,
+)
 
+TestCase = unittest.TestCase
 # bzr compatible interface, for the tests
 class Merge3(simplemerge.Merge3Text):
     """3-way merge of texts.