Merge branch 'master' of git://repo.or.cz/git-gui
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2007 07:14:47 +0000 (00:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Jun 2007 07:14:47 +0000 (00:14 -0700)
* '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

1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge