]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'da/difftool-dir-diff-symlink-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Oct 2021 04:49:18 +0000 (21:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Oct 2021 04:49:19 +0000 (21:49 -0700)
"git difftool --dir-diff" mishandled symbolic links.

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

1  2 
builtin/difftool.c
t/t7800-difftool.sh

Simple merge
Simple merge