diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-07-15 00:08:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-15 00:08:02 -0700 |
| commit | 547905f8cd2a04b3e1117f00025b60f81aa60f47 (patch) | |
| tree | 9e9421e597a9caecc6f16c3afd6a1b77abacabb9 | |
| parent | Merge branch 'js/merge-rr' (diff) | |
| parent | git-gui: MERGE_RR lives in .git/ directly with newer Git versions (diff) | |
| download | tgif-547905f8cd2a04b3e1117f00025b60f81aa60f47.tar.xz | |
Merge git://repo.or.cz/git-gui
* 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
| -rwxr-xr-x | git-gui/git-gui.sh | 10 | ||||
| -rw-r--r-- | git-gui/lib/merge.tcl | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index d89f156fd5..940677cbd8 100755 --- 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 index cc26b07808..5c01875b05 100644 --- 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]} |