Merge branch 'pc/occurred'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:42 +0000 (09:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:42 +0000 (09:56 -0700)
* pc/occurred:
config.c: fix misspelt "occurred" in an error message
refs.h: fix misspelt "occurred" in a comment

1  2 
config.c
diff --cc config.c
Simple merge