merge-recursive: Fix typo

Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mirror · Aug 18, 2010 · a3e4136 · a3e4136
1 parent dd56858
commit a3e4136
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/merge-recursive.c b/merge-recursive.c
@@ -1021,7 +1021,7 @@ static int process_renames(struct merge_options *o,
 				    sha_eq(mfi.sha, ren1->pair->two->sha1) &&
 				    mfi.mode == ren1->pair->two->mode) {
 					/*
-					 * This messaged is part of
+					 * This message is part of
 					 * t6022 test. If you change
 					 * it update the test too.
 					 */