How about doing this?
The first patch is a cleanup as suggested by Johannes[1], the second
fixes the test failure on Windows and the third makes the test behaviour
more explicit and would have helped to detect this issue earlier.
[1/3] t7800: don't hide grep output
[2/3] t7800: fix tests when difftool uses --no-symlinks
[3/3] t7800: run --dir-diff tests with and without symlinks
t/t7800-difftool.sh | 71 +++++++++++++++++++++++++++--------------------------
1 file changed, 36 insertions(+), 35 deletions(-)
--
1.8.2.324.ga64ebd9