Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/simplemerge.py
changeset 38783 e7aa113b14f7
parent 37084 f0b6fbea00cf
child 41759 aaad36b88298 
--- 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:
mercurial