Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'kw/merge-recursive-cleanup'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 19 Sep 2017 01:47:56 +0000
(10:47 +0900)
committer
Junio 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
raw
|
combined
(merge:
0543de4
fc65b00
)
diff --cc
merge-recursive.c
Simple merge