threads / patch / 24776

patchmerge-recursive: Fix typo

Subject: [PATCH] merge-recursive: Fix typo

## tl;dr

One message between Aug 17, 2010 and Aug 17, 2010. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Elijah Newren· Aug 17, 2010, 23:52 UTC · lore
Signed-off-by: Elijah Newren <newren@gmail.com>
---
 merge-recursive.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to merge-recursive.c +1 −1
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

← back to recent threads