diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-06-12 00:05:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-12 00:05:24 -0700 |
| commit | 31c74ca67162674e3ff8fcc294b75881c3e7cc15 (patch) | |
| tree | f89e59d93c018800658d7ae0016cdac64f1faef3 /git-gui/lib/merge.tcl | |
| parent | Merge branch 'maint' of git://repo.or.cz/git-gui into maint (diff) | |
| parent | git-gui: Save geometry before the window layout is damaged (diff) | |
| download | tgif-31c74ca67162674e3ff8fcc294b75881c3e7cc15.tar.xz | |
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui:
git-gui: Save geometry before the window layout is damaged
git-gui: Give amend precedence to HEAD over MERGE_MSG
git-gui: Include 'war on whitespace' fixes from git.git
Diffstat (limited to 'git-gui/lib/merge.tcl')
| -rw-r--r-- | git-gui/lib/merge.tcl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl index 24ed24b3d0..ae0389df5b 100644 --- a/git-gui/lib/merge.tcl +++ b/git-gui/lib/merge.tcl @@ -125,7 +125,8 @@ Please select fewer branches. To merge more than 15 branches, merge the branche set cons [console::new "Merge" $msg] console::exec $cons $cmd \ [namespace code [list _finish $revcnt $cons]] - bind $w <Destroy> {} + + wm protocol $w WM_DELETE_WINDOW {} destroy $w } @@ -250,7 +251,7 @@ proc dialog {} { bind $w <$M1B-Key-Return> $_start bind $w <Visibility> "grab $w; focus $w.source.l" bind $w <Key-Escape> "unlock_index;destroy $w" - bind $w <Destroy> unlock_index + wm protocol $w WM_DELETE_WINDOW "unlock_index;destroy $w" wm title $w "[appname] ([reponame]): Merge" tkwait window $w } |