tree 77c869be217a7ff7c67049f469aa49f513327b7b
parent 61fb0b75d138032c7600fe86640897b900f2fd4f
author Junio C Hamano <junio@pobox.com> 1213687411 -0700
committer Junio C Hamano <gitster@pobox.com> 1213745999 -0700

builtin-rerere: fix a small leak

The data read from MERGE_RR file is kept in path-list by hanging textual
40-byte conflict signature to path of the blob that contains the
conflict.  The signature is strdup'ed twice, and the second copy is given
to the path-list, leaking the first copy.

Signed-off-by: Junio C Hamano <junio@pobox.com>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>