X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-gui%2Flib%2Fmerge.tcl;h=5c01875b051305b5b40a17ac7a2245f69081f41b;hb=581000a4196d196d221bb6164a49a8a52ce30730;hp=cc26b0780882b6e8bde122c2a724d110f439d84f;hpb=b81a7b58875e07d7e82aafced1de9834ba1ef94a;p=git.git

diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index cc26b0780..5c01875b0 100644
--- a/git-gui/lib/merge.tcl
+++ b/git-gui/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]}