summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-07-04 08:22:18 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-07-04 08:22:18 (GMT)
commit1d6d7c4c8545af7c5fd57a4c1ff753f1d4035097 (patch)
treed55363cff8178062fc1f5565de74384d744fab9a /lib
parentf10c1c77430e57a9d506848a34758ee93a77b8b5 (diff)
parentc8e23aaf1814b95d64fc536fdf1acaa54bb28411 (diff)
downloadgit-1d6d7c4c8545af7c5fd57a4c1ff753f1d4035097.zip
git-1d6d7c4c8545af7c5fd57a4c1ff753f1d4035097.tar.gz
git-1d6d7c4c8545af7c5fd57a4c1ff753f1d4035097.tar.bz2
Merge branch 'maint'
* maint: git-gui: Unlock the index when cancelling merge dialog
Diffstat (limited to 'lib')
-rw-r--r--lib/merge.tcl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/merge.tcl b/lib/merge.tcl
index ae0389d..889182f 100644
--- a/lib/merge.tcl
+++ b/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