Merge branch 'rs/check-ignore-multi'
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 18:33:56 +0000 (10:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 18:33:56 +0000 (10:33 -0800)
"git check-ignore" with multiple paths got confused when one is a
file and the other is a directory, which has been fixed.

* rs/check-ignore-multi:
check-ignore: fix mix of directories and other file types

Trivial merge