From: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
Date: Fri, 9 Jul 2010 20:27:49 +0000 (+0200)
Subject: merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
X-Git-Tag: v1.7.2~20^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5e5ffa091bc272f5034a8e3f2bf9fbb0bd79086c;p=git.git

merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency

Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/merge-recursive.c b/merge-recursive.c
index 856e98c08..fb6aa4a55 100644
--- 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;
 	}