[PATCH v4 2/2] merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency

From: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
Date: Jul 9, 2010, 20:27 UTC
Message-ID: <f5c54a4e27321b4ffb0f1f8542530281ef7841eb.1278707023.git.nicolas.s.dev@gmx.fr>
In-Reply-To: <7vd3uystsh.fsf@alter.siamese.dyndns.org>

Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
---
 merge-recursive.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

-- 
1.7.2.rc2.194.g494e9.dirty