Merge branch 'ps/config-error' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:38 +0000 (11:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:38 +0000 (11:13 -0800)
commit2d5ff66...134681d846e5102a9a62ec99c2178fe1
treebb93748...56954fc084beeae99fccab0fcd5f5cf5copy hash to clipboard (tree)
parent9bb7103...f3a4cc7fdb11a8bf15e47b986649d234copy hash to clipboard (diff)
parent3d18064...7af395fb33d1de92633e96571b296305copy hash to clipboard (diff)
cache.h