From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Mar 2017 20:56:00 +0000 (-0700)
Subject: Merge branch 'js/difftool-builtin'
X-Git-Tag: v2.13.0-rc0~97
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=0e758ac5a8073983774dee15f1cd3d3b6c4bb5fd;p=git.git

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
---

0e758ac5a8073983774dee15f1cd3d3b6c4bb5fd