Merge with master to get diff fixes.
authorJunio C Hamano <junkio@cox.net>
Wed, 17 Aug 2005 05:30:46 +0000 (22:30 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 17 Aug 2005 05:30:46 +0000 (22:30 -0700)
1  2 
Makefile
diff --cc Makefile
Simple merge