| commit | 0e758ac5a8073983774dee15f1cd3d3b6c4bb5fd | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 20 Mar 2017 20:56:00 +0000 (20 13:56 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 20 Mar 2017 20:56:00 +0000 (20 13:56 -0700) | ||
| tree | 24798d99bc4527d39240971a984a8b9444803dff | treesnapshot (tar.gz zip) |
| parent | 9d77b0405ce6b471cb5ce3a904368fc25e55643d | commitdiff |
| parent | 18ec800512eb0634a0bf5e86b36ed156fbee73f3 | commitdiff |
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
"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