--- a/mercurial/mdiff.py	Tue May 26 22:37:26 2009 +0200
+++ b/mercurial/mdiff.py	Tue May 26 22:59:52 2009 +0200
@@ -185,7 +185,7 @@
     #
     diff = bdiff.blocks(t1, t2)
     hunk = None
-    for i in xrange(len(diff)):
+    for i, s1 in enumerate(diff):
         # The first match is special.
         # we've either found a match starting at line 0 or a match later
         # in the file.  If it starts later, old and new below will both be
@@ -195,7 +195,6 @@
         else:
             s = [0, 0, 0, 0]
         delta = []
-        s1 = diff[i]
         a1 = s[1]
         a2 = s1[0]
         b1 = s[3]