summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-22 00:55:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-22 00:55:17 (GMT)
commit36dd9393938d4e7f8843c6c587c9b4db077377fc (patch)
tree068987295f97b419452a69d3c15b82882a9e1582 /xdiff
parent664a3348b22bd5fe5d2d97b9985edeaf3a34cb71 (diff)
parent39c68542fc8d8477f2080c99efedb9dce975abc6 (diff)
downloadgit-36dd9393938d4e7f8843c6c587c9b4db077377fc.zip
git-36dd9393938d4e7f8843c6c587c9b4db077377fc.tar.gz
git-36dd9393938d4e7f8843c6c587c9b4db077377fc.tar.bz2
Merge branch 'lt/maint-wrap-zlib'
* lt/maint-wrap-zlib: Wrap inflate and other zlib routines for better error reporting Conflicts: http-push.c http-walker.c sha1_file.c
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions