Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Dec 2008 08:34:58 +0000 (00:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Dec 2008 08:34:58 +0000 (00:34 -0800)
* maint:
  xdiff: give up scanning similar lines early


Trivial merge