Code

Merge branch 'js/maint-diff-temp-smudge' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2009 19:02:30 +0000 (12:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2009 19:02:30 +0000 (12:02 -0700)
* js/maint-diff-temp-smudge:
  Smudge the files fed to external diff and textconv


Trivial merge