diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-09-19 10:47:56 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-19 10:47:56 +0900 |
| commit | 6701263956ca5c0f13703d2f185e0aad81e928cb (patch) | |
| tree | 1824e8e553e2837292075e7a6aa9807da0b4875b /merge-blobs.c | |
| parent | Merge branch 'sb/merge-commit-msg-hook' (diff) | |
| parent | merge-recursive: change current file dir string_lists to hashmap (diff) | |
| download | tgif-6701263956ca5c0f13703d2f185e0aad81e928cb.tar.xz | |
Merge branch 'kw/merge-recursive-cleanup'
A leakfix and code clean-up.
* kw/merge-recursive-cleanup:
merge-recursive: change current file dir string_lists to hashmap
merge-recursive: remove return value from get_files_dirs
merge-recursive: fix memory leak
Diffstat (limited to 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions