Code

Merge branch 'maint-1.6.0' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Feb 2009 23:32:26 +0000 (15:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Feb 2009 23:32:26 +0000 (15:32 -0800)
* maint-1.6.0:
  Clear the delta base cache during fast-import checkpoint

1  2 
cache.h
fast-import.c
sha1_file.c

diff --cc cache.h
Simple merge
diff --cc fast-import.c
Simple merge
diff --cc sha1_file.c
Simple merge