--- a/mercurial/merge.py Sat Aug 08 19:39:45 2015 -0700
+++ b/mercurial/merge.py Sat Aug 08 19:41:25 2015 -0700
@@ -5,13 +5,29 @@
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
+from __future__ import absolute_import
+
+import errno
+import os
+import shutil
import struct
-from node import nullid, nullrev, hex, bin
-from i18n import _
-from mercurial import obsolete
-import error as errormod, util, filemerge, copies, subrepo, worker
-import errno, os, shutil
+from .i18n import _
+from .node import (
+ bin,
+ hex,
+ nullid,
+ nullrev,
+)
+from . import (
+ copies,
+ error as errormod,
+ filemerge,
+ obsolete,
+ subrepo,
+ util,
+ worker,
+)
_pack = struct.pack
_unpack = struct.unpack