# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1439088851 25200
# Node ID 241a1324a1807b4176ea4677693c588dd9fe8ead
# Parent  fb5664eb8414fee21d7ad87fd246706ae0a0e1f8
simplemerge: use absolute_import

diff -r fb5664eb8414 -r 241a1324a180 mercurial/simplemerge.py
--- a/mercurial/simplemerge.py	Sat Aug 08 19:53:25 2015 -0700
+++ b/mercurial/simplemerge.py	Sat Aug 08 19:54:11 2015 -0700
@@ -16,9 +16,17 @@
 # mbp: "you know that thing where cvs gives you conflict markers?"
 # s: "i hate that."
 
-from i18n import _
-import scmutil, util, mdiff
-import sys, os
+from __future__ import absolute_import
+
+import os
+import sys
+
+from .i18n import _
+from . import (
+    mdiff,
+    scmutil,
+    util,
+)
 
 class CantReprocessAndShowBase(Exception):
     pass