X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=lib%2Fmerge.tcl;h=5c01875b051305b5b40a17ac7a2245f69081f41b;hb=7cce5b2cbc12a73eca3f62a885e9dbad17b250a5;hp=cc26b0780882b6e8bde122c2a724d110f439d84f;hpb=b5e2f805e6bdbaae629399fea92deb053f4ca7cd;p=git.git

diff --git a/lib/merge.tcl b/lib/merge.tcl
index cc26b0780..5c01875b0 100644
--- a/lib/merge.tcl
+++ b/lib/merge.tcl
@@ -257,6 +257,7 @@ proc _reset_wait {fd} {
 
 		catch {file delete [gitdir MERGE_HEAD]}
 		catch {file delete [gitdir rr-cache MERGE_RR]}
+		catch {file delete [gitdir MERGE_RR]}
 		catch {file delete [gitdir SQUASH_MSG]}
 		catch {file delete [gitdir MERGE_MSG]}
 		catch {file delete [gitdir GITGUI_MSG]}