Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Jul 2010 06:33:07 +0000 (23:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Jul 2010 06:33:07 +0000 (23:33 -0700)
* maint:
  xdiff: optimise for no whitespace difference when ignoring whitespace.


Trivial merge