Merge branch 'jc/index-extended-flags'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2008 06:41:47 +0000 (23:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2008 06:41:47 +0000 (23:41 -0700)
* jc/index-extended-flags:
  index: future proof for "extended" index entries

1  2 
cache.h

diff --cc cache.h
Simple merge