Merge branch 'maint'
commit6dbcb59e8271c16cbec486932bd3069279e09c60
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Dec 2008 08:34:58 +0000 (3 00:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Dec 2008 08:34:58 +0000 (3 00:34 -0800)
tree0f2b9612484d9bd86daa0d0df798bc29fd07822c
parent24b1f65fed0396497ae42c3c12390370819e8bc4
parent2ab4de57ea2c423fe8abae5278507106972ef1fe
Merge branch 'maint'

* maint:
  xdiff: give up scanning similar lines early