summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-28 21:18:47 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-28 21:18:47 -0700
commit45792b64c1752d1b6736d0f49a8e4a003e458756 (patch)
tree212efd8a613c7a820666a1eda1bb9eba1117d5ab /combine-diff.c
parent0b98954975502f56f1de2a4cb0569f7e80fd44d0 (diff)
parent8fb3ad76b1782a5439343b9601f73a9287a245cf (diff)
downloadgit-45792b64c1752d1b6736d0f49a8e4a003e458756.tar.gz
Merge branch 'di/fast-import-deltified-tree'
* di/fast-import-deltified-tree: fast-import: prevent producing bad delta fast-import: add a test for tree delta base corruption
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions