From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Oct 2021 20:51:48 +0000 (-0700)
Subject: Merge branch 'da/difftool-dir-diff-symlink-fix' into maint
X-Git-Tag: v2.33.1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef09a7fbbe5a74e628be3aa8af98f67344606807;p=thirdparty%2Fgit.git

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

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

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

ef09a7fbbe5a74e628be3aa8af98f67344606807