diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-08-17 17:52:27 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-18 11:55:38 -0700 |
| commit | a3e413675478585206966bdbb7fd7bf24b9d1ea7 (patch) | |
| tree | bc9ae6254aa95803a218a64d6aa4d6ebef58e456 | |
| parent | Mark tests that use symlinks as needing SYMLINKS prerequisite (diff) | |
| download | tgif-a3e413675478585206966bdbb7fd7bf24b9d1ea7.tar.xz | |
merge-recursive: Fix typo
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index b0f055ecd4..52936c35ae 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. */ |