##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Fix another sortdiff cornercase...
mpm@selenic.com -
r361:88268aa2 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -58,14 +58,14 b' def sortdiff(a, b):'
58 yield (am, bm, la - am) # return a match
58 yield (am, bm, la - am) # return a match
59
59
60 # skip mismatched lines from b
60 # skip mismatched lines from b
61 while lb < lenb and b[lb] < a[la]:
61 while la < lena and lb < lenb and b[lb] < a[la]:
62 lb += 1
62 lb += 1
63
63
64 if lb >= lenb:
64 if lb >= lenb:
65 break
65 break
66
66
67 # skip mismatched lines from a
67 # skip mismatched lines from a
68 while la < lena and b[lb] > a[la]:
68 while la < lena and lb < lenb and b[lb] > a[la]:
69 la += 1
69 la += 1
70
70
71 if la >= lena:
71 if la >= lena:
General Comments 0
You need to be logged in to leave comments. Login now