From: Peter Colberg <peter@colberg.org>
Date: Fri, 10 Jun 2016 19:05:26 +0000 (-0400)
Subject: config.c: fix misspelt "occurred" in an error message
X-Git-Tag: v2.9.1~21^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a39f61e0468d7aea1a6f57ddbdcc74aaafa8410;p=thirdparty%2Fgit.git

config.c: fix misspelt "occurred" in an error message

Signed-off-by: Peter Colberg <peter@colberg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/config.c b/config.c
index 6dbc8a409e..f4b6454bba 100644
--- a/config.c
+++ b/config.c
@@ -1278,7 +1278,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)