Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Tue, 12 Jun 2007 03:58:11 +0000 (23:58 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Tue, 12 Jun 2007 03:58:11 +0000 (23:58 -0400)
* maint:
git-gui: Save geometry before the window layout is damaged
git-gui: Give amend precedence to HEAD over MERGE_MSG

No differences found