summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-15 20:46:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-15 20:46:39 -0700
commitf5fcb59034ed820ba43b914c3c6038786753d298 (patch)
treedf0689a0fcee3c32826ed8347547c586d2776d1a /ll-merge.h
parentMerge branch 'jc/maint-bundle-too-quiet' into maint (diff)
parentpatch-id.c: use strbuf instead of a fixed buffer (diff)
downloadtgif-f5fcb59034ed820ba43b914c3c6038786753d298.tar.xz
Merge branch 'ms/patch-id-with-overlong-line' into maint
* ms/patch-id-with-overlong-line: patch-id.c: use strbuf instead of a fixed buffer
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions