summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2019-11-05 17:07:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-11-10 07:00:54 (GMT)
commit15beaaa3d1f6b555900446deb5e376b4f806d734 (patch)
tree96a960cd2c0c9b1cceeb9c7f5ed46680ba5e67b9 /rerere.c
parent891529792547c55bf8c94ea8831631702492e839 (diff)
downloadgit-15beaaa3d1f6b555900446deb5e376b4f806d734.zip
git-15beaaa3d1f6b555900446deb5e376b4f806d734.tar.gz
git-15beaaa3d1f6b555900446deb5e376b4f806d734.tar.bz2
Fix spelling errors in code comments
Reported-by: Jens Schleusener <Jens.Schleusener@fossies.org> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rerere.c')
-rw-r--r--rerere.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/rerere.c b/rerere.c
index 3e51fdf..9281131 100644
--- 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)
{