undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Junio C Hamano 2008-07-15 00:08:02 -07:00
commit 547905f8cd
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-gui/git-gui.sh
View File

@ -1995,9 +1995,13 @@ if {[is_enabled multicommit]} {
} }
} }
.mbar.repository add command -label [mc Quit] \ if {[is_MacOSX]} {
proc ::tk::mac::Quit {args} { do_quit }
} else {
.mbar.repository add command -label [mc Quit] \
-command do_quit \ -command do_quit \
-accelerator $M1T-Q -accelerator $M1T-Q
}
# -- Edit Menu # -- Edit Menu
# #

1
git-gui/lib/merge.tcl
View File

@ -257,6 +257,7 @@ proc _reset_wait {fd} {
catch {file delete [gitdir MERGE_HEAD]} catch {file delete [gitdir MERGE_HEAD]}
catch {file delete [gitdir rr-cache MERGE_RR]} catch {file delete [gitdir rr-cache MERGE_RR]}
catch {file delete [gitdir MERGE_RR]}
catch {file delete [gitdir SQUASH_MSG]} catch {file delete [gitdir SQUASH_MSG]}
catch {file delete [gitdir MERGE_MSG]} catch {file delete [gitdir MERGE_MSG]}
catch {file delete [gitdir GITGUI_MSG]} catch {file delete [gitdir GITGUI_MSG]}