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 /git-gui/lib | |
| parent | ebcffb1d44643bab69671abdf79209489e64dbef (diff) | |
| parent | f049e0944d32715ee8893d290d1c52888216fbe4 (diff) | |
| download | git-547905f8cd2a04b3e1117f00025b60f81aa60f47.tar.gz git-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
Diffstat (limited to 'git-gui/lib')
| -rw-r--r-- | git-gui/lib/merge.tcl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl index cc26b0780..5c01875b0 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]} |