From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Wed, 9 Aug 2006 20:31:49 +0000 (+0200)
Subject: merge-recur: do not die unnecessarily
X-Git-Tag: v1.4.3-rc1~174^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/984b65707e25c426a32feb9b9d46f077b605cb31?hp=984b65707e25c426a32feb9b9d46f077b605cb31

merge-recur: do not die unnecessarily

When the cache is dirty, and we switch the index file from temporary
to final, we want to discard the cache without complaint.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---