Merge branch 'ak/t7800-wo-readlink' into maint
commitc4cdde45f0e8111ab7aac03ddb9a89ef1029fb50
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 Jul 2016 17:44:15 +0000 (11 10:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Jul 2016 17:44:15 +0000 (11 10:44 -0700)
tree2c53a37a399725c552770914e01fadbd82216413
parent0c72d6da31dd6ffce56989e4bcbd1b8650b1ef25
parentd2addc3b96886bb4dee71ef36684c8010bc37d16
Merge branch 'ak/t7800-wo-readlink' into maint

One among four invocations of readlink(1) in our test suite has
been rewritten so that the test can run on systems without the
command (others are in valgrind test framework and t9802).

* ak/t7800-wo-readlink:
  t7800: readlink may not be available
t/t7800-difftool.sh