Mercurial > hg
comparison mercurial/mdiff.py @ 326:235443668bea
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-----
author | mpm@selenic.com |
---|---|
date | Mon, 13 Jun 2005 14:53:33 -0800 |
parents | ad87e19854a6 |
children | 27d08c0c2a7e |
comparison
equal
deleted
inserted
replaced
325:ad87e19854a6 | 326:235443668bea |
---|---|
48 | 48 |
49 while 1: | 49 while 1: |
50 am, bm, = la, lb | 50 am, bm, = la, lb |
51 | 51 |
52 # walk over matching lines | 52 # walk over matching lines |
53 while lb < lenb and la < lenb and a[la] == b[lb] : | 53 while lb < lenb and la < lena and a[la] == b[lb] : |
54 la += 1 | 54 la += 1 |
55 lb += 1 | 55 lb += 1 |
56 | 56 |
57 if la > am: | 57 if la > am: |
58 yield (am, bm, la - am) # return a match | 58 yield (am, bm, la - am) # return a match |