Code

Merge branch 'tf/string-list-init'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:47:04 +0000 (12:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:47:04 +0000 (12:47 -0700)
* tf/string-list-init:
  string_list: Add STRING_LIST_INIT macro and make use of it.

1  2 
builtin/fetch.c
builtin/grep.c
builtin/rerere.c
merge-recursive.c

diff --cc builtin/fetch.c
Simple merge
diff --cc builtin/grep.c
Simple merge
Simple merge
Simple merge