| commit | c8e23aaf1814b95d64fc536fdf1acaa54bb28411 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Wed, 4 Jul 2007 06:29:32 +0000 (4 02:29 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Wed, 4 Jul 2007 06:29:32 +0000 (4 02:29 -0400) | ||
| tree | 1141d1bd34735f012402765b52d52b0e59aa7e5e | treesnapshot (tar.gz zip) |
| parent | 7aecb128779ffd8258f01f4382df963900ae6acd | commitdiff |
git-gui: Unlock the index when cancelling merge dialog
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>
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>
| lib/merge.tcl | diffblobblamehistory |