Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Oct 2008 20:03:52 +0000 (13:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Oct 2008 20:03:52 +0000 (13:03 -0700)
commite845e16ee6de99a203db47eeb840daf3b1914ec9
tree6881244e543cbf5b17cb31a8b8512fa758a608b5
parent46dc1b0e332612aa32c139007fa33f4b429de9d1
parent98fa473887d0bebd38d568bb07232a336a642dcf
Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other

* jk/maint-ls-files-other:
  refactor handling of "other" files in ls-files and status

Conflicts:
read-cache.c
cache.h
read-cache.c
t/t7502-status.sh
wt-status.c