diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-18 11:14:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-18 11:14:00 -0800 |
| commit | 79cfe0c5c4920bf68da548ad0d5bcdb425ce8d5f (patch) | |
| tree | 9ae710ca2bcb33eca92ebcb1fff61b98d4e08194 /git.c | |
| parent | 01e0f162a70f61de0b7aa0e9d8c49c03cbafeb64 (diff) | |
| parent | 74b531f65feaa09b5c3963f788b437a368933730 (diff) | |
Merge branch 'ml/mailmap' into maint
* ml/mailmap:
mailmap: xcalloc mailmap_info
Conflicts:
mailmap.c
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions