daemon: use socklen_t

[git.git] / builtin / merge-recursive.c
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c

index 70e1d258fb49ad917674f62cd1864d3a1517752a..c33091b3ed52bc8539ff82f039ec8c7718f3dcc2 100644 (file)
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -4,6 +4,9 @@
  #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)
  {
         static char githead_env[8 + 40 + 1];
@@ -30,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];