From: Elijah Newren <newren@gmail.com>
Date: Tue, 17 Aug 2010 23:52:27 +0000 (-0600)
Subject: merge-recursive: Fix typo
X-Git-Tag: v1.7.3-rc0~30^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a3e413675478585206966bdbb7fd7bf24b9d1ea7;p=git.git

merge-recursive: Fix typo

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/merge-recursive.c b/merge-recursive.c
index b0f055ecd..52936c35a 100644
--- 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.
 					 */