Merge branch 'jk/fix-ls-files-other'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Oct 2008 00:57:56 +0000 (17:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Oct 2008 00:57:56 +0000 (17:57 -0700)
* jk/fix-ls-files-other:
  refactor handling of "other" files in ls-files and status

1  2 
read-cache.c

diff --cc read-cache.c
Simple merge