merge-recursive: Fix typo
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 17, 2010 at 17:52 UTC
a3e413675478585206966bdbb7fd7bf24b9d1ea7
1 file changed
+1
-1
merge-recursive.c
+1
-1
@@ -1021,7 +1021,7 @@ static int process_renames(struct merge_options *o,
1021
sha_eq(mfi.sha, ren1->pair->two->sha1) &&
1022
mfi.mode == ren1->pair->two->mode) {
1023
/*
1024
- * This messaged is part of
1024
+ * This message is part of
1025
* t6022 test. If you change
1026
* it update the test too.
1027
*/