summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Jiang Xin <worldhello.net@gmail.com>2012-08-27 13:36:53 +0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-08-27 09:26:30 -0700
commit9aa98efca286f7e7795a30614d79f120d0cd786c (patch)
tree648f56551bb483d850d124f80ac5ac91a8e092b9 /merge-recursive.h
parentFix tests under GETTEXT_POISON on git-apply (diff)
downloadtgif-9aa98efca286f7e7795a30614d79f120d0cd786c.tar.xz
Fix tests under GETTEXT_POISON on pack-object
Use the i18n-specific test functions in test scripts for pack-object. This issue was was introduced in v1.7.10.2-556-g46140: 46140 index-pack: use streaming interface for collision test on large blobs cf2ba pack-objects: use streaming interface for reading large loose blobs and been broken under GETTEXT_POISON=YesPlease since. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions