My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0543de4 fc65b00)
Merge branch 'kw/merge-recursive-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Sep 2017 01:47:56 +0000 (10:47 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Sep 2017 01:47:56 +0000 (10:47 +0900)
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

1  2 
merge-recursive.c patch | diff1 | diff2 | blob | history

diff --cc merge-recursive.c
Simple merge
The core git plumbing