Andrew's git / gitweb.git / diff
?
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)
* jk/no-textconv-symlink:
diff: don't use pathname-based diff drivers for symlinks

1  2 
diff.c patch | diff1 | diff2 | blob | history
t/t4011-diff-symlink.sh patch | diff1 | diff2 | blob | history
diff --cc diff.c
Simple merge
diff --cc t/t4011-diff-symlink.sh
Simple merge