diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-08-26 15:45:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-26 15:45:34 -0700 |
| commit | 88bd19be2fa4ae3343e89b73c103c3c51fe3044f (patch) | |
| tree | 5384e94b4e7c93fd7304db7cc1d482006faf0f5e /git-merge-resolve.sh | |
| parent | Merge branch 'dt/untracked-sparse' (diff) | |
| parent | ps_matched: xcalloc() takes nmemb and then element size (diff) | |
| download | tgif-88bd19be2fa4ae3343e89b73c103c3c51fe3044f.tar.xz | |
Merge branch 'jc/calloc-pathspec'
* jc/calloc-pathspec:
ps_matched: xcalloc() takes nmemb and then element size
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions