]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 93a8ed2 5bafb35)
Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftool
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Sep 2021 18:26:17 +0000 (11:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Sep 2021 18:26:17 +0000 (11:26 -0700)
commit77bd616367905437fe6181611e0c65fe23160ea1
treeb9d43ef6f513b3c1aaaf0028678717241f1aaba2tree | snapshot
parent93a8ed28ea29fe1b5691e3e3d93a1870df717ac0commit | diff
parent5bafb3576ac8eb8464ddd5cc14a1211aaa46364bcommit | diff
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
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.