From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 Jan 2015 19:38:32 +0000 (-0800)
Subject: Merge branch 'rs/plug-strbuf-leak-in-merge'
X-Git-Tag: v2.3.0-rc0~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d61e79050cd30231456740c3006aca94ed074db0?ds=inline;hp=--cc

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

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

d61e79050cd30231456740c3006aca94ed074db0