diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:47:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:47:04 -0700 |
| commit | 6b5005c88b3a0c360249deb8ca8b92201abaa824 (patch) | |
| tree | 177a02c572549b4caa5872ef3ecd4275e860b5af /merge-recursive.c | |
| parent | 165dc789d5e201a06e0de5a984e4529ae62027fc (diff) | |
| parent | 183113a5ca99cb228b2ba0a29e53f1ac11f2c7c2 (diff) | |
| download | git-6b5005c88b3a0c360249deb8ca8b92201abaa824.tar.gz git-6b5005c88b3a0c360249deb8ca8b92201abaa824.tar.xz | |
Merge branch 'tf/string-list-init'
* tf/string-list-init:
string_list: Add STRING_LIST_INIT macro and make use of it.
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 763565996..6cff9cdc8 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -800,7 +800,8 @@ static int process_renames(struct merge_options *o, struct string_list *b_renames) { int clean_merge = 1, i, j; - struct string_list a_by_dst = {NULL, 0, 0, 0}, b_by_dst = {NULL, 0, 0, 0}; + struct string_list a_by_dst = STRING_LIST_INIT_NODUP; + struct string_list b_by_dst = STRING_LIST_INIT_NODUP; const struct rename *sre; for (i = 0; i < a_renames->nr; i++) { |