From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Nov 2015 23:13:01 +0000 (-0800)
Subject: Merge branch 'da/difftool'
X-Git-Tag: v2.7.0-rc0~47
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c253b82e42d8e6673917efb431479f8a9165de76

Merge branch 'da/difftool'

The code to prepare the working tree side of temporary directory
for the "dir-diff" feature forgot that symbolic links need not be
copied (or symlinked) to the temporary area, as the code already
special cases and overwrites them.  Besides, it was wrong to try
computing the object name of the target of symbolic link, which may
not even exist or may be a directory.

* da/difftool:
difftool: ignore symbolic links in use_wt_file
---

c253b82e42d8e6673917efb431479f8a9165de76