From: Johannes Schindelin Date: Sat, 12 Jul 2008 14:56:59 +0000 (+0100) Subject: git-gui: MERGE_RR lives in .git/ directly with newer Git versions X-Git-Tag: v1.6.0-rc0~61^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f049e0944d32715ee8893d290d1c52888216fbe4;p=git.git 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 --- 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]}