diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-07-04 04:22:18 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-07-04 04:22:18 -0400 |
| commit | 1d6d7c4c8545af7c5fd57a4c1ff753f1d4035097 (patch) | |
| tree | d55363cff8178062fc1f5565de74384d744fab9a /lib/commit.tcl | |
| parent | f10c1c77430e57a9d506848a34758ee93a77b8b5 (diff) | |
| parent | c8e23aaf1814b95d64fc536fdf1acaa54bb28411 (diff) | |
| download | git-1d6d7c4c8545af7c5fd57a4c1ff753f1d4035097.tar.gz | |
Merge branch 'maint'
* maint:
git-gui: Unlock the index when cancelling merge dialog
Diffstat (limited to 'lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions