git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0543de4 fc65b00)
Merge branch 'kw/merge-recursive-cleanup'
authorJunio C Hamano <redacted>
Tue, 19 Sep 2017 01:47:56 +0000 (10:47 +0900)
committerJunio C Hamano <redacted>
Tue, 19 Sep 2017 01:47:56 +0000 (10:47 +0900)
commit6701263956ca5c0f13703d2f185e0aad81e928cb
tree1824e8e553e2837292075e7a6aa9807da0b4875btree | snapshot
parent0543de438f39cc99bcde807313e972a6caac5840commit | diff
parentfc65b00da7ebfc96d3b93a59ee99f820deb5c93ecommit | diff
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
merge-recursive.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT