Merge branch 'master' of git://repo.or.cz/git-gui
commit1924d64f6e070edf1ad1949bf2eb95d4d2451f30
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2007 07:14:47 +0000 (12 00:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2007 07:14:47 +0000 (12 00:14 -0700)
treeaf77317e800b35c312ef562ffb72fa7c045af738
parent75d8ff138dd640a117c6aaa625d0f6b835adbd3a
parent03e1bed4a4887607ae90cd121cb4851d10ef2e8b
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
git-gui/git-gui.sh
git-gui/lib/blame.tcl
git-gui/lib/branch_rename.tcl
git-gui/lib/browser.tcl
git-gui/lib/class.tcl
git-gui/lib/console.tcl
git-gui/lib/merge.tcl
git-gui/lib/remote_branch_delete.tcl