From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Apr 2009 19:02:30 +0000 (-0700)
Subject: Merge branch 'js/maint-diff-temp-smudge' into maint
X-Git-Tag: v1.6.2.2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb365a7a564152662e3f9c5b9a92e37aaf726ed9;p=thirdparty%2Fgit.git

Merge branch 'js/maint-diff-temp-smudge' into maint

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

cb365a7a564152662e3f9c5b9a92e37aaf726ed9