From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Jun 2007 07:14:47 +0000 (-0700)
Subject: Merge branch 'master' of git://repo.or.cz/git-gui
X-Git-Tag: v1.5.3-rc0~117
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1924d64f6e070edf1ad1949bf2eb95d4d2451f30;p=git.git

Merge branch 'master' of git://repo.or.cz/git-gui

* 'master' of git://repo.or.cz/git-gui:
  git-gui: Save geometry before the window layout is damaged
  git-gui: Give amend precedence to HEAD over MERGE_MSG
  git-gui: Include 'war on whitespace' fixes from git.git
---

1924d64f6e070edf1ad1949bf2eb95d4d2451f30