Junio C Hamano 1924d64f6e 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		2007-06-12 00:14:47 -07:00
..
lib	Merge branch 'master' of git://repo.or.cz/git-gui	2007-06-12 00:14:47 -07:00
.gitignore	Merge branch 'master' of git://repo.or.cz/git-gui	2007-05-07 23:51:00 -04:00
GIT-VERSION-GEN	Merge branch 'master' of git://repo.or.cz/git-gui	2007-06-11 00:52:43 -07:00
Makefile	Merge branch 'maint' of git://repo.or.cz/git-gui into maint	2007-05-28 20:23:10 -07:00
git-gui.sh	Merge branch 'master' of git://repo.or.cz/git-gui	2007-06-12 00:14:47 -07:00