Merge branch 'js/difftool-builtin'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Mar 2017 20:56:00 +0000 (13:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Mar 2017 20:56:00 +0000 (13:56 -0700)
"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

Trivial merge