Merge branch 'jk/no-textconv-symlink' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:46:20 +0000 (24 12:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:46:20 +0000 (24 12:46 -0800)
* jk/no-textconv-symlink:
  diff: don't use pathname-based diff drivers for symlinks

1  2 
diff.c
t/t4011-diff-symlink.sh

diff --cc diff.c
Simple merge
Simple merge