summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-26 15:45:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-26 15:45:34 -0700
commit88bd19be2fa4ae3343e89b73c103c3c51fe3044f (patch)
tree5384e94b4e7c93fd7304db7cc1d482006faf0f5e /builtin/fmt-merge-msg.c
parentMerge branch 'dt/untracked-sparse' (diff)
parentps_matched: xcalloc() takes nmemb and then element size (diff)
downloadtgif-88bd19be2fa4ae3343e89b73c103c3c51fe3044f.tar.xz
Merge branch 'jc/calloc-pathspec'
* jc/calloc-pathspec: ps_matched: xcalloc() takes nmemb and then element size
Diffstat (limited to 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions