Merge git://repo.or.cz/git-gui

gitster · gitster · commit 547905f8cd2a · 2008-07-15T00:08:02.000-07:00
* git://repo.or.cz/git-gui:
  git-gui: MERGE_RR lives in .git/ directly with newer Git versions
  git-gui: Exit shortcut in MacOSX repaired
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
@@ -1995,9 +1995,13 @@ if {[is_enabled multicommit]} {
 	}
 }
 
-.mbar.repository add command -label [mc Quit] \
-	-command do_quit \
-	-accelerator $M1T-Q
+if {[is_MacOSX]} {
+	proc ::tk::mac::Quit {args} { do_quit }
+} else {
+	.mbar.repository add command -label [mc Quit] \
+		-command do_quit \
+		-accelerator $M1T-Q
+}
 
 # -- Edit Menu
 #
diff --git a/git-gui/lib/merge.tcl b/git-gui/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]}

Original file line number	Diff line number	Diff line change
`@@ -1995,9 +1995,13 @@ if {[is_enabled multicommit]} {`
`1995`	`1995`	`}`
`1996`	`1996`	`}`
`1997`	`1997`
`1998`		`-.mbar.repository add command -label [mc Quit] \`
`1999`		`- -command do_quit \`
`2000`		`- -accelerator $M1T-Q`
	`1998`	`+if {[is_MacOSX]} {`
	`1999`	`+ proc ::tk::mac::Quit {args} { do_quit }`
	`2000`	`+} else {`
	`2001`	`+ .mbar.repository add command -label [mc Quit] \`
	`2002`	`+ -command do_quit \`
	`2003`	`+ -accelerator $M1T-Q`
	`2004`	`+}`
`2001`	`2005`
`2002`	`2006`	`# -- Edit Menu`
`2003`	`2007`	`#`