Hi Junio, On Mon, 20 Mar 2017, Junio C Hamano wrote: > * js/difftool-builtin (2017-03-15) 3 commits > (merged to 'next' on 2017-03-16 at 3fccb60a07) > + 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. David fixed much more than the segfault. He fixed the underlying problem, i.e. *also* the "fatal" message. Ciao, Johannes