Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Thu, 12 Apr 2007 01:43:01 +0000 (18:43 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 12 Apr 2007 01:43:01 +0000 (18:43 -0700)
* maint:
GIT 1.5.1.1
cvsserver: Fix handling of diappeared files on update
fsck: do not complain on detached HEAD.
(encode_85, decode_85): Mark source buffer pointer as "const".

1  2 
builtin-fsck.c
cache.h
diff --cc builtin-fsck.c
Simple merge
diff --cc cache.h
Simple merge