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>
Nicolas Sebrecht committed
Jul 9, 2010 at 22:27 UTC
5e5ffa091bc272f5034a8e3f2bf9fbb0bd79086c
1 file changed
+1
-1
merge-recursive.c
+1
-1
@@ -1214,7 +1214,7 @@ int merge_trees(struct merge_options *o,
1214
}
1215
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
*result = head;
1219
return 1;
1220
}