Andrew's git / gitweb.git / blobdiff
?
unpack-trees.c: look ahead in the index
[gitweb.git] / builtin-merge-recursive.c
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index d26a96e486f2a84fdfc54527d15b9acdf7ea34bb..710674c6b2cccec4f1e0baa477a11d78cda72833 100644 (file)
--- 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 <base>... -- <head> <remote> ...", argv[0]);
+               usagef("%s <base>... -- <head> <remote> ...", argv[0]);
 
        for (i = 1; i < argc; ++i) {
                if (!strcmp(argv[i], "--"))