From f049e0944d32715ee8893d290d1c52888216fbe4 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 12 Jul 2008 15:56:59 +0100 Subject: [PATCH] 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 Signed-off-by: Shawn O. Pearce --- lib/merge.tcl | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/merge.tcl b/lib/merge.tcl index cc26b07..5c01875 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]} -- 2.11.4.GIT