Merge branch 'rs/plug-strbuf-leak-in-merge'
* rs/plug-strbuf-leak-in-merge: merge: release strbuf after use in suggest_conflicts()
Junio C Hamano committed
Jan 12, 2015 at 11:38 UTC
d61e79050cd30231456740c3006aca94ed074db0
No changes.