Merge branch 'js/maint-diff-temp-smudge'
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Mar 2009 07:27:30 +0000 (00:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Mar 2009 07:27:30 +0000 (00:27 -0700)
commitb71fdc590d660f81e8e2ebfdab989feb60e86dde
treea73038255ad7ab3d43dfed19e47d3d410382bb86
parentb2aa958dc29eb836a831138f6d84ad7cfadf4355
parent4e218f54b3de6aa8ef7d15020c4507031a519f7d
Merge branch 'js/maint-diff-temp-smudge'

* js/maint-diff-temp-smudge:
  Smudge the files fed to external diff and textconv
diff.c