Merge branch 'jk/no-textconv-symlink'
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 22:59:10 +0000 (14:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 22:59:10 +0000 (14:59 -0800)
commit6a2e93f1074d5a8b25c2020805e6b8d795d13e4d
tree137792eaffc80800186318ae6c894144fda8ffbb
parentfbfe5de5bdaaf9572c1811e3b4ddfaa35e6bb227
parentd391c0ff94e1b314b0664db0e8eb5bd92934f9cb
Merge branch 'jk/no-textconv-symlink'

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