![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Wed, 4 Jul 2007 08:22:18 +0000 (04:22 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Wed, 4 Jul 2007 08:22:18 +0000 (04:22 -0400) | ||
| commit | 1d6d7c4c8545af7c5fd57a4c1ff753f1d4035097 | |
| tree | d55363cff8178062fc1f5565de74384d744fab9a | tree | snapshot |
| parent | f10c1c77430e57a9d506848a34758ee93a77b8b5 | commit | diff |
| parent | c8e23aaf1814b95d64fc536fdf1acaa54bb28411 | commit | diff |
Merge branch 'maint'
* maint:
git-gui: Unlock the index when cancelling merge dialog
* maint:
git-gui: Unlock the index when cancelling merge dialog