Merge branch 'jk/escaped-wildcard-dwim'

[thirdparty/git.git] / rerere.c

diff --git a/rerere.c b/rerere.c
index 3e51fdfe589ce67c5a745845907e15909f4ed905..9281131a9f10cdf1f83c54b42e4fd7034ded16db 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -431,7 +431,7 @@ static int handle_conflict(struct strbuf *out, struct rerere_io *io,
  * and NUL concatenated together.
  *
  * Return 1 if conflict hunks are found, 0 if there are no conflict
- * hunks and -1 if an error occured.
+ * hunks and -1 if an error occurred.
  */
 static int handle_path(unsigned char *hash, struct rerere_io *io, int marker_size)
 {