Merge branch 'maint'
commit5b5275f6e9ca6284ca123f729d5a78f409e448fb
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Jul 2010 06:33:07 +0000 (5 23:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Jul 2010 06:33:07 +0000 (5 23:33 -0700)
tree8b0303c1af1c2e051155bac15b40dc7c0ee450ae
parent869d58813b24c74e84c9388041eafcef40cb51e4
parentb4cf0f1784362fb4aa2383d8d5d829caa92ca3a0
Merge branch 'maint'

* maint:
  xdiff: optimise for no whitespace difference when ignoring whitespace.