Code

Merge 'fixes' branch.
authorJunio C Hamano <junkio@cox.net>
Sat, 24 Sep 2005 01:46:34 +0000 (18:46 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 24 Sep 2005 01:46:34 +0000 (18:46 -0700)
Signed-off-by: Junio C Hamano <junkio@cox.net>
1  2 
.gitignore
Documentation/git-diff-tree.txt

diff --cc .gitignore
Simple merge
Simple merge