diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 20:06:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 20:06:43 (GMT) |
| commit | 9d3d0dbb14fa529492d828485b1f65aa9e0ed199 (patch) | |
| tree | 0d2c14f1edb85b98ad68981046908e48bb6ccda9 /config.c | |
| parent | 25227f0beacf00d80420e313ffed48032352037f (diff) | |
| parent | 3a39f61e0468d7aea1a6f57ddbdcc74aaafa8410 (diff) | |
| download | git-9d3d0dbb14fa529492d828485b1f65aa9e0ed199.zip git-9d3d0dbb14fa529492d828485b1f65aa9e0ed199.tar.gz git-9d3d0dbb14fa529492d828485b1f65aa9e0ed199.tar.bz2 | |
Merge branch 'pc/occurred' into maint
Typofix.
* pc/occurred:
config.c: fix misspelt "occurred" in an error message
refs.h: fix misspelt "occurred" in a comment
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |