X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-merge-recursive.c;h=d26a96e486f2a84fdfc54527d15b9acdf7ea34bb;hb=ade2ca0ca9f8335be300d5538e1ca9cb3594ae64;hp=6b534c1a66bf7a4abbe0f38add7585dee65a6a44;hpb=dfe50511c7e5ec2bc771c9a5f4c3318332a7744e;p=git.git
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 6b534c1a6..d26a96e48 100644
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c
@@ -33,7 +33,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
}
if (argc < 4)
- die("Usage: %s ... -- ...\n", argv[0]);
+ die("Usage: %s ... -- ...", argv[0]);
for (i = 1; i < argc; ++i) {
if (!strcmp(argv[i], "--"))
@@ -45,8 +45,9 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
bases[bases_count++] = sha;
}
else
- warning("Cannot handle more than %zu bases. "
- "Ignoring %s.", ARRAY_SIZE(bases)-1, argv[i]);
+ warning("Cannot handle more than %d bases. "
+ "Ignoring %s.",
+ (int)ARRAY_SIZE(bases)-1, argv[i]);
}
if (argc - i != 3) /* "--" "" "" */
die("Not handling anything other than two heads merge.");