Merge branch 'pc/occurred'

* pc/occurred:
  config.c: fix misspelt "occurred" in an error message
  refs.h: fix misspelt "occurred" in a comment
This commit is contained in:
Junio C Hamano
2016-06-27 09:56:42 -07:00
2 changed files with 2 additions and 2 deletions

View File

@ -1281,7 +1281,7 @@ static void git_config_raw(config_fn_t fn, void *data)
* something went really wrong and we should stop
* immediately.
*/
die(_("unknown error occured while reading the configuration files"));
die(_("unknown error occurred while reading the configuration files"));
}
static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)