diff -r 57c6c24b9bc4 -r 72803c8edaa4 mercurial/manifest.py --- a/mercurial/manifest.py Tue Aug 21 02:41:20 2012 +0200 +++ b/mercurial/manifest.py Mon Aug 27 23:14:27 2012 +0200 @@ -154,7 +154,7 @@ # combine the changed lists into one list for sorting work = [(x, False) for x in added] work.extend((x, True) for x in removed) - # this could use heapq.merge() (from python2.6+) or equivalent + # this could use heapq.merge() (from Python 2.6+) or equivalent # since the lists are already sorted work.sort()