git-gui: MERGE_RR lives in .git/ directly with newer Git versions
Now that MERGE_RR was moved out of .git/rr-cache/, we have to delete it somewhere else. Just in case somebody wants to use a newer git-gui with an older Git, the file .git/rr-cache/MERGE_RR is removed, too (if it exists). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Johannes Schindelin committed
Jul 12, 2008 at 15:56 UTC
f049e0944d32715ee8893d290d1c52888216fbe4
1 file changed
+1
lib/merge.tcl
+1
@@ -257,6 +257,7 @@ proc _reset_wait {fd} {
257
258
catch {file delete [gitdir MERGE_HEAD]}
259
catch {file delete [gitdir rr-cache MERGE_RR]}
260
+ catch {file delete [gitdir MERGE_RR]}
261
catch {file delete [gitdir SQUASH_MSG]}
262
catch {file delete [gitdir MERGE_MSG]}
263
catch {file delete [gitdir GITGUI_MSG]}