From: Junio C Hamano <redacted>
Date: Mon, 12 Jan 2015 19:38:32 +0000 (-0800)
Subject: Merge branch 'rs/plug-strbuf-leak-in-merge'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=d61e79050cd30231456740c3006aca94ed074db0;p=git.git

Merge branch 'rs/plug-strbuf-leak-in-merge'

* rs/plug-strbuf-leak-in-merge:
  merge: release strbuf after use in suggest_conflicts()
---

d61e79050cd30231456740c3006aca94ed074db0