From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 4 Jul 2007 08:22:18 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc1~16^2~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1d6d7c4c8545af7c5fd57a4c1ff753f1d4035097;p=git.git

Merge branch 'maint'

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

1d6d7c4c8545af7c5fd57a4c1ff753f1d4035097