summaryrefslogtreecommitdiff
path: root/mergetools/emerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-07-11 10:44:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-11 10:44:15 -0700
commitc4cdde45f0e8111ab7aac03ddb9a89ef1029fb50 (patch)
tree2c53a37a399725c552770914e01fadbd82216413 /mergetools/emerge
parentMerge branch 'jk/tzoffset-fix' into maint (diff)
parentt7800: readlink may not be available (diff)
downloadtgif-c4cdde45f0e8111ab7aac03ddb9a89ef1029fb50.tar.xz
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
Diffstat (limited to 'mergetools/emerge')
0 files changed, 0 insertions, 0 deletions