Merge branch 'maint' of git://repo.or.cz/git-gui into maint

[git.git] / git-gui / lib / merge.tcl

diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index ae0389df5bfb13b2823720c241b861b7b36b9e95..889182f5454ac0f636fc57c31a16331c097b0c71 100644 (file)
--- 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