| commit | ef09a7fbbe5a74e628be3aa8af98f67344606807 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 12 Oct 2021 20:51:48 +0000 (12 13:51 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 12 Oct 2021 20:51:48 +0000 (12 13:51 -0700) | ||
| tree | aac353adfce132644d46c84878fa8c852f68a208 | treesnapshot (tar.gz zip) |
| parent | b59c06092f2ed8f434ffe298bf55578dffb18cca | commitdiff |
| parent | 5bafb3576ac8eb8464ddd5cc14a1211aaa46364b | commitdiff |
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
"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 | blobhistory |
| t/t7800-difftool.sh | diff1 | diff2 | blobhistory |