tree aac353adfce132644d46c84878fa8c852f68a208
parent b59c06092f2ed8f434ffe298bf55578dffb18cca
parent 5bafb3576ac8eb8464ddd5cc14a1211aaa46364b
author Junio C Hamano <gitster@pobox.com> 1634071908 -0700
committer Junio C Hamano <gitster@pobox.com> 1634071908 -0700

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