From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 26 Jul 2016 16:06:17 +0000 (+0200)
Subject: merge-recursive: allow write_tree_from_memory() to error out
X-Git-Tag: v2.10.0-rc0~21^2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fbc87eb54409b5c7b080f1c23b767daefc9d6ede?hp=fbc87eb54409b5c7b080f1c23b767daefc9d6ede

merge-recursive: allow write_tree_from_memory() to error out

It is possible that a tree cannot be written (think: disk full). We
will want to give the caller a chance to clean up instead of letting
the program die() in such a case.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---