From: Shawn O. Pearce <spearce@spearce.org>
Date: Tue, 12 Jun 2007 03:58:11 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc0~117^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/03e1bed4a4887607ae90cd121cb4851d10ef2e8b?hp=03e1bed4a4887607ae90cd121cb4851d10ef2e8b

Merge branch 'maint'

* maint:
git-gui: Save geometry before the window layout is damaged
git-gui: Give amend precedence to HEAD over MERGE_MSG
---