builtin/apply: make add_conflicted_stages_file() return -1 on error

diff --git a/config.c b/config.c
index 87629164b3623885fa0428790a6e7fa2eb643215..bea937e4ecf8417a910882c1aafb263e792f2e1c 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1306,7 +1306,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)