mdiff: fix the fix
authormpm@selenic.com
Mon, 13 Jun 2005 14:53:33 -0800
changeset 326 235443668bea
parent 325 ad87e19854a6
child 327 a9ad98a9c9bc
mdiff: fix the fix -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 mdiff: fix the fix I saw you check in the thing back in but with another typo. You check in "la < lenb", should be "la < lena". So we are even :-) Chris manifest hash: 57157502250b0120bcc12a75a530d4c133673b39 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrg5tywK+sNU5EO8RAvLPAKCOs76LKPniKHFa15YwzWWsNZ5/xACfesl3 WCiUjdeYUtU3jVKCEwmjAT0= =+GFy -----END PGP SIGNATURE-----
mercurial/mdiff.py
--- a/mercurial/mdiff.py
+++ b/mercurial/mdiff.py
@@ -50,7 +50,7 @@ def sortdiff(a, b):
         am, bm, = la, lb
 
         # walk over matching lines
-        while lb < lenb and la < lenb and a[la] == b[lb] :
+        while lb < lenb and la < lena and a[la] == b[lb] :
             la += 1
             lb += 1