Merge branch 'pc/occurred' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:43 +0000 (13:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:43 +0000 (13:06 -0700)
commit9d3d0db...14fa529492d828485b1f65aa9e0ed199
tree0d2c14f...edb85b98ad68981046908e48bb6ccda9copy hash to clipboard (tree)
parent25227f0...eacf00d80420e313ffed48032352037fcopy hash to clipboard (diff)
parent3a39f61...0468d7aea1a6f57ddbdcc74aaafa8410copy hash to clipboard (diff)
config.c