| commit | 77bd616367905437fe6181611e0c65fe23160ea1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Sep 2021 18:26:17 +0000 (23 11:26 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Sep 2021 18:26:17 +0000 (23 11:26 -0700) | ||
| tree | b9d43ef6f513b3c1aaaf0028678717241f1aaba2 | treesnapshot (tar.gz zip) |
| parent | 93a8ed28ea29fe1b5691e3e3d93a1870df717ac0 | commitdiff |
| parent | 5bafb3576ac8eb8464ddd5cc14a1211aaa46364b | commitdiff |
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
* da/difftool-dir-diff-symlink-fix:
difftool: fix symlink-file writing in dir-diff mode
| builtin/difftool.c | diff1 | diff2 | blobhistory |
| t/t7800-difftool.sh | diff1 | diff2 | blobhistory |