Merge branch 'jc/ls-files-o'

* jc/ls-files-o:
ls-files: honour per-directory ignore file from higher directories.

diff --cc ls-files.c
Simple merge