summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Clemens Buchacher <drizzd@aon.at>2012-01-07 12:42:45 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-08 15:07:40 -0800
commit71039fb9d562731ed700ef072b6fcb18e2478361 (patch)
tree191b9955c98e2a82e61f70887bb37f8ed310662c /Documentation/merge-strategies.txt
parentdashed externals: kill children on exit (diff)
downloadtgif-71039fb9d562731ed700ef072b6fcb18e2478361.tar.xz
git-daemon: add tests
The semantics of the git daemon tests are similar to the http transport tests. In fact, they are only a slightly modified copy of t5550, plus the newly added remote error tests. All git-daemon tests will be skipped unless the environment variable GIT_TEST_GIT_DAEMON is set. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions