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

Nicolas Sebrecht · gitster · commit 5e5ffa091bc2 · 2010-07-09T16:28:46.000-07:00
Signed-off-by: Nicolas Sebrecht &lt;nicolas.s.dev@gmx.fr&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1214,7 +1214,7 @@ int merge_trees(struct merge_options *o,`
`1214`	`1214`	`}`
`1215`	`1215`
`1216`	`1216`	`if (sha_eq(common->object.sha1, merge->object.sha1)) {`
`1217`		`- output(o, 0, "Already uptodate!");`
	`1217`	`+ output(o, 0, "Already up-to-date!");`
`1218`	`1218`	`*result = head;`
`1219`	`1219`	`return 1;`
`1220`	`1220`	`}`