diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-13 21:12:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 21:12:14 -0800 |
| commit | 6d1cdadbeeb03f40250526e29b1f1a91582911d8 (patch) | |
| tree | 6d829c82ee1c03e29d723bc81113f8452bbbe294 /object.c | |
| parent | c3ea051544cb1d98a5ae7f64d077084a9a5db5c1 (diff) | |
| parent | 74b531f65feaa09b5c3963f788b437a368933730 (diff) | |
| download | git-6d1cdadbeeb03f40250526e29b1f1a91582911d8.tar.gz | |
Merge branch 'ml/mailmap' into maint-1.7.6
* ml/mailmap:
mailmap: xcalloc mailmap_info
Conflicts:
mailmap.c
Diffstat (limited to 'object.c')
0 files changed, 0 insertions, 0 deletions