Re: [PATCH] merge: release strbuf after use in suggest_conflicts()

2014-12-23 Thread Jonathan Nieder
René Scharfe wrote: > Signed-off-by: Rene Scharfe > --- > builtin/merge.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/builtin/merge.c b/builtin/merge.c > index 215d485..d722889 100644 > --- a/builtin/merge.c > +++ b/builtin/merge.c > @@ -894,6 +894,7 @@ static int suggest_conflicts(

[PATCH] merge: release strbuf after use in suggest_conflicts()

2014-12-23 Thread René Scharfe
Signed-off-by: Rene Scharfe --- builtin/merge.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/merge.c b/builtin/merge.c index 215d485..d722889 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -894,6 +894,7 @@ static int suggest_conflicts(void) append_conflicts_hint(&m