Andrew's git / gitweb.git / diff
?
merge-recur: do not die unnecessarily
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Wed, 9 Aug 2006 20:31:49 +0000 (22:31 +0200)
committerJunio C Hamano <junkio@cox.net>
Wed, 9 Aug 2006 21:57:27 +0000 (14:57 -0700)
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>
No differences found