Merge branch 'ta/string-list-init'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Jul 2014 18:35:54 +0000 (11:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Jul 2014 18:35:54 +0000 (11:35 -0700)
* ta/string-list-init:
replace memset with string-list initializers
string-list: add string_list initializer helper function

1  2 
builtin/commit.c
merge-recursive.c
submodule.c
transport.c
Simple merge
Simple merge
diff --cc submodule.c
Simple merge
diff --cc transport.c
Simple merge