mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git-gui: Unlock the index when cancelling merge dialog
This commit is contained in:
Shawn O. Pearce
2007-07-04 04:22:18 -04:00
parent f10c1c7743 c8e23aaf18
commit 1d6d7c4c85
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/merge.tcl
View File

@ -213,7 +213,9 @@ proc dialog {} {
pack $w.buttons.visualize -side left pack $w.buttons.visualize -side left
button $w.buttons.create -text Merge -command $_start button $w.buttons.create -text Merge -command $_start
pack $w.buttons.create -side right 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.cancel -side right -padx 5
pack $w.buttons -side bottom -fill x -pady 10 -padx 10 pack $w.buttons -side bottom -fill x -pady 10 -padx 10