Merge tag 'v2.8.6' into maint-2.9
authorJunio C Hamano <gitster@pobox.com>
Sun, 30 Jul 2017 21:52:14 +0000 (14:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 30 Jul 2017 21:52:14 +0000 (14:52 -0700)
Git 2.8.6

1  2 
cache.h
path.c

diff --cc cache.h
Simple merge
diff --cc path.c
Simple merge