Merge branch 'jk/no-textconv-symlink' into maint
commit78bce6c7e93f4c8797da06cf93f59b7ac8e84ec0
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)
tree9a03b1a3d634d5599d1cda642860c7d9da199a89
parent42a038ceae4406bc727440ed2152f8dd753a9f73
parentd391c0ff94e1b314b0664db0e8eb5bd92934f9cb
Merge branch 'jk/no-textconv-symlink' into maint

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