merge-recursive: use "up-to-date" instead of "uptodate" in error mess…

…age for consistency Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mirror · Jul 9, 2010 · 5e5ffa0 · 5e5ffa0
1 parent 9918285
commit 5e5ffa0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/merge-recursive.c b/merge-recursive.c
@@ -1214,7 +1214,7 @@ int merge_trees(struct merge_options *o,
 	}
 
 	if (sha_eq(common->object.sha1, merge->object.sha1)) {
-		output(o, 0, "Already uptodate!");
+		output(o, 0, "Already up-to-date!");
 		*result = head;
 		return 1;
 	}