summaryrefslogtreecommitdiff
path: root/mergetools/bc3
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-05-13 14:05:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-13 14:05:54 -0700
commitc1c4a878bb70b6f46550ab370bba320a3a5dda70 (patch)
tree6b39e419dc0505cb07bd0c3f76fdc4fc46e098b9 /mergetools/bc3
parentMerge branch 'ep/fix-test-lib-functions-report' into maint (diff)
parenttype_from_string_gently: make sure length matches (diff)
downloadtgif-c1c4a878bb70b6f46550ab370bba320a3a5dda70.tar.xz
Merge branch 'jk/type-from-string-gently' into maint
"git cat-file bl $blob" failed to barf even though there is no object type that is "bl". * jk/type-from-string-gently: type_from_string_gently: make sure length matches
Diffstat (limited to 'mergetools/bc3')
0 files changed, 0 insertions, 0 deletions