diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-06-27 09:56:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-27 09:56:42 -0700 |
| commit | af325b0f9abacda405e19947a929ad5a3a14cb90 (patch) | |
| tree | 7d053b28eaf6805144c044600fc1a77919f2f842 /config.c | |
| parent | 0bbda4bac71605af21be2670c1f4d04d10594fcc (diff) | |
| parent | 3a39f61e0468d7aea1a6f57ddbdcc74aaafa8410 (diff) | |
| download | git-af325b0f9abacda405e19947a929ad5a3a14cb90.tar.gz git-af325b0f9abacda405e19947a929ad5a3a14cb90.tar.xz | |
Merge branch 'pc/occurred'
* 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) |