Merge branch 'jc/ls-files-o'
authorJunio C Hamano <junkio@cox.net>
Fri, 10 Feb 2006 06:19:07 +0000 (22:19 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 10 Feb 2006 06:19:07 +0000 (22:19 -0800)
* jc/ls-files-o:
  ls-files: honour per-directory ignore file from higher directories.


Trivial merge