]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b59c060 5bafb35)
Merge branch 'da/difftool-dir-diff-symlink-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Oct 2021 20:51:48 +0000 (13:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Oct 2021 20:51:48 +0000 (13:51 -0700)
commitef09a7fbbe5a74e628be3aa8af98f67344606807
treeaac353adfce132644d46c84878fa8c852f68a208tree | snapshot
parentb59c06092f2ed8f434ffe298bf55578dffb18ccacommit | diff
parent5bafb3576ac8eb8464ddd5cc14a1211aaa46364bcommit | diff
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
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.