From: Junio C Hamano Date: Wed, 17 Nov 2010 22:59:10 +0000 (-0800) Subject: Merge branch 'jk/no-textconv-symlink' X-Git-Tag: v1.7.4-rc0~147 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a2e93f1074d5a8b25c2020805e6b8d795d13e4d;p=git.git Merge branch 'jk/no-textconv-symlink' * jk/no-textconv-symlink: diff: don't use pathname-based diff drivers for symlinks --- 6a2e93f1074d5a8b25c2020805e6b8d795d13e4d