]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 92382d1 5bafb35)
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)
commit6a4f5dadd3d373db29053697aaefc67e31416699
tree5feb58eb565bb8cf8cf698c649aedd4601fe7569tree | snapshot
parent92382d14cd4146ad05e891a529ed3ce5822d11f7commit | diff
parent5bafb3576ac8eb8464ddd5cc14a1211aaa46364bcommit | diff
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
builtin/difftool.c diff1 | diff2 | blob | history
t/t7800-difftool.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.