Merge branch 'jk/string-list-static-init'

diff --git a/config.c b/config.c
index f51c56bf92d384ace98e580c510842bd7eab9871..d7ce34b33d67c38245e77b7082d80f350e4f7eb7 100644 (file)
--- a/config.c
+++ b/config.c
@@ -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)