Merge branch 'pc/occurred'
commitaf325b0f9abacda405e19947a929ad5a3a14cb90
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:42 +0000 (27 09:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:42 +0000 (27 09:56 -0700)
tree7d053b28eaf6805144c044600fc1a77919f2f842
parent0bbda4bac71605af21be2670c1f4d04d10594fcc
parent3a39f61e0468d7aea1a6f57ddbdcc74aaafa8410
Merge branch 'pc/occurred'

* pc/occurred:
  config.c: fix misspelt "occurred" in an error message
  refs.h: fix misspelt "occurred" in a comment
config.c