summaryrefslogtreecommitdiff
path: root/templates/this--description
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-22 11:27:31 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-22 11:27:31 -0800
commit1aea303d7eafc5f178b253f4d069eb5f2acfb409 (patch)
treec4db1a26a5f63f8820e26e408163dac8dbe56763 /templates/this--description
parentMerge branch 'jc/maint-lf-to-crlf-keep-crlf' (diff)
parentUpdate jk/maint-strbuf-missing-init to builtin/ rename (diff)
downloadtgif-1aea303d7eafc5f178b253f4d069eb5f2acfb409.tar.xz
Merge branch 'jk/maint-strbuf-missing-init'
* jk/maint-strbuf-missing-init: commit, merge: initialize static strbuf Conflicts: builtin/merge.c
Diffstat (limited to 'templates/this--description')
0 files changed, 0 insertions, 0 deletions