mirror of
https://github.com/git/git.git
synced 2024-11-05 22:19:47 +01:00
Merge branch 'maint'
* maint: git-gui: Unlock the index when cancelling merge dialog
This commit is contained in:
commit
1d6d7c4c85
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user