Merge branch 'lt/preload-lstat'
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Nov 2008 03:24:13 +0000 (19:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Nov 2008 03:24:13 +0000 (19:24 -0800)
* lt/preload-lstat:
  Fix index preloading for racy dirty case
  Add cache preload facility

1  2 
Documentation/config.txt
builtin-diff.c
cache.h

Simple merge
diff --cc builtin-diff.c
Simple merge
diff --cc cache.h
Simple merge