Merge branch 'jk/no-textconv-symlink' into next
commit0a99e7584bd5b8603cda5e6c02dd6c254b3770d2
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:07 +0000 (5 11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:07 +0000 (5 11:39 -0700)
tree4a64fe484e53ae2091edb89b334821cfce26951c
parent6836d70a565d72963f73cb079e4777d5488e0fdb
parentd391c0ff94e1b314b0664db0e8eb5bd92934f9cb
Merge branch 'jk/no-textconv-symlink' into next

* jk/no-textconv-symlink:
  diff: don't use pathname-based diff drivers for symlinks
diff.c
t/t4011-diff-symlink.sh