From: Johannes Schindelin Date: Sat, 12 Jul 2008 14:56:59 GMT Subject: [PATCH 2/2 (for GIT-GUI)] git-gui: MERGE_RR lives in .git/ directly with newer Git versions Message-ID: In-Reply-To: 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 --- git-gui/lib/merge.tcl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) 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]} -- 1.5.6.2.511.ge432a