Merge branch 'jk/maint-strbuf-missing-init'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Dec 2011 19:27:31 +0000 (11:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Dec 2011 19:27:31 +0000 (11:27 -0800)
commit1aea303d7eafc5f178b253f4d069eb5f2acfb409
treec4db1a26a5f63f8820e26e408163dac8dbe56763
parent339aff0846ccf21905d047c20e3c7d077d6f300b
parent03f94ae9f909952ed5a78917ab319a312889354b
Merge branch 'jk/maint-strbuf-missing-init'

* jk/maint-strbuf-missing-init:
  commit, merge: initialize static strbuf

Conflicts:
builtin/merge.c
builtin/commit.c
builtin/merge.c