mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
c8e23aaf18
Pressing the escape key while in the merge dialog cancels the merge and correctly unlocks the index. Unfortunately this is not true of the Cancel button, using it closes the dialog but does not release the index lock, rendering git-gui frozen until you restart it. We now properly release the index lock when the Cancel button is used. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> |
||
---|---|---|
.. | ||
blame.tcl | ||
branch.tcl | ||
browser.tcl | ||
class.tcl | ||
commit.tcl | ||
console.tcl | ||
database.tcl | ||
diff.tcl | ||
error.tcl | ||
index.tcl | ||
merge.tcl | ||
option.tcl | ||
remote.tcl | ||
shortcut.tcl | ||
transport.tcl |