From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Sep 2021 18:26:17 +0000 (-0700)
Subject: Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftool
X-Git-Tag: v2.34.0-rc0~71^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77bd616367905437fe6181611e0c65fe23160ea1;p=thirdparty%2Fgit.git

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

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

77bd616367905437fe6181611e0c65fe23160ea1