summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.6.0.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-20 13:56:00 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-20 13:56:00 -0700
commit0e758ac5a8073983774dee15f1cd3d3b6c4bb5fd (patch)
tree24798d99bc4527d39240971a984a8b9444803dff /Documentation/RelNotes/1.6.0.txt
parentFifth batch for 2.13 (diff)
parentdifftool: handle modified symlinks in dir-diff mode (diff)
downloadtgif-0e758ac5a8073983774dee15f1cd3d3b6c4bb5fd.tar.xz
Merge branch 'js/difftool-builtin'
"git difftool --dir-diff" used to die a controlled death giving a "fatal" message when encountering a locally modified symbolic link, but it started segfaulting since v2.12. This has been fixed. * js/difftool-builtin: difftool: handle modified symlinks in dir-diff mode t7800: cleanup cruft left behind by tests t7800: remove whitespace before redirect
Diffstat (limited to 'Documentation/RelNotes/1.6.0.txt')
0 files changed, 0 insertions, 0 deletions