| commit | 984b65707e25c426a32feb9b9d46f077b605cb31 | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Wed, 9 Aug 2006 20:31:49 +0000 (9 22:31 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 9 Aug 2006 21:57:27 +0000 (9 14:57 -0700) | ||
| tree | 0d2c7afe34844fd1ff9016909978ed4e6e641ad7 | treesnapshot (tar.gz zip) |
| parent | 8918b0c9c2667c5a69461955135c709b09561f72 | commitdiff |
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>
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>
| merge-recursive.c | diffblobblamehistory |