Merge branch 'jk/no-textconv-symlink' into next

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

diff --cc diff.c
Simple merge

diff --cc t/t4011-diff-symlink.sh
Simple merge