summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-30 00:09:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-30 00:09:41 -0700
commit5b42477b59886a85d4b49a60313f9b9d4a0d576f (patch)
tree55e42d432085f0afec9a5bc9f4251adcf1dcbfa5 /builtin
parentMerge branch 'bc/maint-submodule-fix-parked' into maint (diff)
parentread_gitfile_gently: use ssize_t to hold read result (diff)
downloadtgif-5b42477b59886a85d4b49a60313f9b9d4a0d576f.tar.xz
Merge branch 'jm/maint-misc-fix' into maint
* jm/maint-misc-fix: read_gitfile_gently: use ssize_t to hold read result remove tests of always-false condition rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions