Merge branch 'js/maint-diff-temp-smudge' into next
commit842c0051e70a8016ba13bd0bdd708a73a8dd678b
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2009 07:34:45 +0000 (23 00:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2009 07:34:45 +0000 (23 00:34 -0700)
tree0cbcf9f25f703e7f4b9a38736560c37652b24207
parent90521aa80311d1e4e6c18d4cba6f3f1d8dee1f81
parent4e218f54b3de6aa8ef7d15020c4507031a519f7d
Merge branch 'js/maint-diff-temp-smudge' into next

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