From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Oct 2021 04:49:18 +0000 (-0700)
Subject: Merge branch 'da/difftool-dir-diff-symlink-fix'
X-Git-Tag: v2.34.0-rc0~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a4f5dadd3d373db29053697aaefc67e31416699;p=thirdparty%2Fgit.git

Merge branch 'da/difftool-dir-diff-symlink-fix'

"git difftool --dir-diff" mishandled symbolic links.

* da/difftool-dir-diff-symlink-fix:
  difftool: fix symlink-file writing in dir-diff mode
---

6a4f5dadd3d373db29053697aaefc67e31416699