--- a/mercurial/merge.py Mon Feb 10 07:13:10 2014 +0400
+++ b/mercurial/merge.py Fri Feb 28 02:28:12 2014 +0100
@@ -34,7 +34,7 @@
[type][length][content]
Type is a single character, length is a 4 bytes integer, content is an
- arbitrary suites of bytes of lenght `length`.
+ arbitrary suites of bytes of length `length`.
Type should be a letter. Capital letter are mandatory record, Mercurial
should abort if they are unknown. lower case record can be safely ignored.
@@ -125,10 +125,10 @@
while off < end:
rtype = data[off]
off += 1
- lenght = _unpack('>I', data[off:(off + 4)])[0]
+ length = _unpack('>I', data[off:(off + 4)])[0]
off += 4
- record = data[off:(off + lenght)]
- off += lenght
+ record = data[off:(off + length)]
+ off += length
records.append((rtype, record))
f.close()
except IOError, err: