Code

Merge branch 'maint' of git://repo.or.cz/git-gui into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2007 07:05:24 +0000 (00:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2007 07:05:24 +0000 (00:05 -0700)
commit31c74ca67162674e3ff8fcc294b75881c3e7cc15
treef89e59d93c018800658d7ae0016cdac64f1faef3
parentc288a2f1316b642ff073d4213cf691297610503c
parent39fa2a983d55b37759b99e67f9f1892879efb775
Merge branch 'maint' of git://repo.or.cz/git-gui into maint

* 'maint' 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-VERSION-GEN
git-gui/git-gui.sh
git-gui/lib/blame.tcl
git-gui/lib/browser.tcl
git-gui/lib/class.tcl
git-gui/lib/console.tcl
git-gui/lib/merge.tcl