summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-24 12:46:20 -0800
committerJunio C Hamano <gitster@pobox.com>2010-11-24 12:46:20 -0800
commit78bce6c7e93f4c8797da06cf93f59b7ac8e84ec0 (patch)
tree9a03b1a3d634d5599d1cda642860c7d9da199a89 /xdiff
parent42a038ceae4406bc727440ed2152f8dd753a9f73 (diff)
parentd391c0ff94e1b314b0664db0e8eb5bd92934f9cb (diff)
downloadgit-78bce6c7e93f4c8797da06cf93f59b7ac8e84ec0.tar.gz
Merge branch 'jk/no-textconv-symlink' into maint
* jk/no-textconv-symlink: diff: don't use pathname-based diff drivers for symlinks
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions