tree 77037a51ded54618ba33a5f1466a340c42802b3a
parent b1735b1ab7743700064af528a998cdc952c8b9a1
author Clemens Buchacher <drizzd@aon.at> 1289850739 +0100
committer Junio C Hamano <gitster@pobox.com> 1292345713 -0800

use persistent memory for rejected paths

An aborted merge prints the list of rejected paths as part of the
error message. Since commit f66caaf9 (do not overwrite files in
leading path), some of those paths do not have static buffers, so
we have to keep a copy. Use string_list's to accomplish this.

This changes the order of the list to the order in which the paths
are processed. Previously, it was reversed.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>