From: Elijah Newren Date: Tue, 17 Aug 2010 23:52:27 GMT Subject: [PATCH] merge-recursive: Fix typo Message-ID: <1282089147-17132-1-git-send-email-newren@gmail.com> Signed-off-by: Elijah Newren --- merge-recursive.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index fb6aa4a..c00ad99 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. */ -- 1.7.2.1.227.g086c8