diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-07-21 12:35:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-21 12:35:39 -0700 |
| commit | 9ab08822556c49a7856dadd0e9a42f9ec2aaf850 (patch) | |
| tree | f52f20367d13f2078fe6199e230322c899b9308d /xdiff/xmerge.c | |
| parent | Ninth batch for 2.1 (diff) | |
| parent | use xmemdupz() to allocate copies of strings given by start and length (diff) | |
| download | tgif-9ab08822556c49a7856dadd0e9a42f9ec2aaf850.tar.xz | |
Merge branch 'maint'
* maint:
use xmemdupz() to allocate copies of strings given by start and length
use xcalloc() to allocate zero-initialized memory
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions