summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2008-07-12 14:56:59 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-07-13 21:58:40 (GMT)
commitf049e0944d32715ee8893d290d1c52888216fbe4 (patch)
treeb0b23106454701c145b8073ae0d042bbe2c75de2
parentaf894943cb9dbad1d6892dc983dc6ac0fa6ca8e8 (diff)
downloadgit-f049e0944d32715ee8893d290d1c52888216fbe4.zip
git-f049e0944d32715ee8893d290d1c52888216fbe4.tar.gz
git-f049e0944d32715ee8893d290d1c52888216fbe4.tar.bz2
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>
-rw-r--r--lib/merge.tcl1
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]}