diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-12 01:45:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-12 01:45:56 -0700 |
| commit | 1b2782a5e2f88bf5e6e2cbb58e54fea015e21af5 (patch) | |
| tree | 19c5485ad50623c4c44d9268fdfa5afa98bd2619 /git-gui/lib/merge.tcl | |
| parent | Clarify documentation of fast-import's D subcommand (diff) | |
| parent | git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree} (diff) | |
| download | git-1b2782a5e2f88bf5e6e2cbb58e54fea015e21af5.tar.gz git-1b2782a5e2f88bf5e6e2cbb58e54fea015e21af5.zip | |
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui:
git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}
git-gui: Don't linewrap within console windows
git-gui: Correct ls-tree buffering problem in browser
git-gui: Skip nicknames when selecting author initials
git-gui: Ensure windows shortcuts always have .bat extension
git-gui: Include a Push action on the left toolbar
git-gui: Bind M1-P to push action
git-gui: Don't bind F5/M1-R in all windows
git-gui: Unlock the index when cancelling merge dialog
git-gui: properly popup error if gitk should be started but is not installed
Diffstat (limited to 'git-gui/lib/merge.tcl')
| -rw-r--r-- | git-gui/lib/merge.tcl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl index ae0389df5b..889182f545 100644 --- a/git-gui/lib/merge.tcl +++ b/git-gui/lib/merge.tcl @@ -213,7 +213,9 @@ proc dialog {} { pack $w.buttons.visualize -side left button $w.buttons.create -text Merge -command $_start pack $w.buttons.create -side right - button $w.buttons.cancel -text {Cancel} -command [list destroy $w] + button $w.buttons.cancel \ + -text {Cancel} \ + -command "unlock_index;destroy $w" pack $w.buttons.cancel -side right -padx 5 pack $w.buttons -side bottom -fill x -pady 10 -padx 10 |