| commit | 6701263956ca5c0f13703d2f185e0aad81e928cb | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Sep 2017 01:47:56 +0000 (19 10:47 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Sep 2017 01:47:56 +0000 (19 10:47 +0900) | ||
| tree | 1824e8e553e2837292075e7a6aa9807da0b4875b | treesnapshot (tar.gz zip) |
| parent | 0543de438f39cc99bcde807313e972a6caac5840 | commitdiff |
| parent | fc65b00da7ebfc96d3b93a59ee99f820deb5c93e | commitdiff |
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
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
| merge-recursive.c | diff1 | diff2 | blobhistory |