Merge branch 'rs/discard-index-discard-array' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2013 17:39:01 +0000 (10:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2013 17:39:01 +0000 (10:39 -0700)
* rs/discard-index-discard-array:
  read-cache: free cache in discard_index
  read-cache: add simple performance test

1  2 
Makefile
read-cache.c

diff --cc Makefile
Simple merge
diff --cc read-cache.c
Simple merge