Merge branch 'js/maint-diff-temp-smudge' into maint
commitcb365a7a564152662e3f9c5b9a92e37aaf726ed9
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2009 19:02:30 +0000 (2 12:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2009 19:02:30 +0000 (2 12:02 -0700)
tree98c9c3721fa7f5984c4109cb2dcb1b56ae053b17
parent1e7ef0253c91bf2f25f9d8e44795b642737e664e
parent4e218f54b3de6aa8ef7d15020c4507031a519f7d
Merge branch 'js/maint-diff-temp-smudge' into maint

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