From 5e5ffa091bc272f5034a8e3f2bf9fbb0bd79086c Mon Sep 17 00:00:00 2001
From: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
Date: Fri, 9 Jul 2010 22:27:49 +0200
Subject: [PATCH] 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>
---
 merge-recursive.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merge-recursive.c b/merge-recursive.c
index 856e98c083..fb6aa4a551 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;
 	}
-- 
2.11.4.GIT