# HG changeset patch # User mpm@selenic.com # Date 1118703213 28800 # Node ID 235443668bea3d8dc5521b89d7b3afbdb143abc8 # Parent ad87e19854a641b87c79a84d6b3a071475c4c4fb 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----- diff -r ad87e19854a6 -r 235443668bea mercurial/mdiff.py --- a/mercurial/mdiff.py Mon Jun 13 13:43:48 2005 -0800 +++ b/mercurial/mdiff.py Mon Jun 13 14:53:33 2005 -0800 @@ -50,7 +50,7 @@ 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