Merge branch 'jc/ls-files-o'
authorJunio C Hamano <junkio@cox.net>
Thu, 9 Feb 2006 08:21:27 +0000 (00:21 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 9 Feb 2006 08:21:27 +0000 (00:21 -0800)
* jc/ls-files-o:
  ls-files: honour per-directory ignore file from higher directories.

1  2 
ls-files.c

diff --cc ls-files.c
Simple merge