Merge branch 'dl/xdiff'
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Nov 2008 05:51:30 +0000 (21:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Nov 2008 05:51:30 +0000 (21:51 -0800)
* dl/xdiff:
  xdiff: give up scanning similar lines early


Trivial merge