Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Wed, 4 Jul 2007 08:22:18 +0000 (04:22 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Wed, 4 Jul 2007 08:22:18 +0000 (04:22 -0400)
commit1d6d7c4c8545af7c5fd57a4c1ff753f1d4035097
treed55363cff8178062fc1f5565de74384d744fab9a
parentf10c1c77430e57a9d506848a34758ee93a77b8b5
parentc8e23aaf1814b95d64fc536fdf1acaa54bb28411
Merge branch 'maint'

* maint:
  git-gui: Unlock the index when cancelling merge dialog