Andrew's git / gitweb.git / blobdiff
?
i18n: git-init basic messages
[gitweb.git] / builtin / merge-recursive.c
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index 5a52f3d0a23d12ed64fd49134cf94c8b0045eeb2..c33091b3ed52bc8539ff82f039ec8c7718f3dcc2 100644 (file)
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -2,6 +2,10 @@
 #include "commit.h"
 #include "tag.h"
 #include "merge-recursive.h"
+#include "xdiff-interface.h"
+
+static const char builtin_merge_recursive_usage[] =
+       "git %s <base>... -- <head> <remote> ...";
 
 static const char *better_branch_name(const char *branch)
 {
@@ -29,7 +33,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
                o.subtree_shift = "";
 
        if (argc < 4)
-               usagef("%s <base>... -- <head> <remote> ...", argv[0]);
+               usagef(builtin_merge_recursive_usage, argv[0]);
 
        for (i = 1; i < argc; ++i) {
                const char *arg = argv[i];