diff -r 7eba8f83129b -r e7aa113b14f7 mercurial/simplemerge.py
--- a/mercurial/simplemerge.py	Wed Aug 01 12:57:15 2018 -0700
+++ b/mercurial/simplemerge.py	Wed Aug 01 13:00:45 2018 -0700
@@ -58,7 +58,8 @@
     """
     if (aend - astart) != (bend - bstart):
         return False
-    for ia, ib in zip(xrange(astart, aend), xrange(bstart, bend)):
+    for ia, ib in zip(pycompat.xrange(astart, aend),
+                      pycompat.xrange(bstart, bend)):
         if a[ia] != b[ib]:
             return False
     else: