Code

Merge branch 'maint-1.5.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 Apr 2008 04:50:48 +0000 (21:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 Apr 2008 04:50:48 +0000 (21:50 -0700)
* maint-1.5.4:
  t5516: remove ambiguity test (1)
  Linked glossary from cvs-migration page
  write-tree: properly detect failure to write tree objects

1  2 
cache-tree.c
t/t5516-fetch-push.sh

diff --cc cache-tree.c
Simple merge
Simple merge