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)
* js/maint-diff-temp-smudge:
Smudge the files fed to external diff and textconv

1  2 
diff.c
diff --cc diff.c
Simple merge