Merge branch 'js/maint-merge-recursive-r-d-conflict'

diff --git a/builtin-pack-refs.c b/builtin-pack-refs.c
index ff90aefa1c1818b90391223c8cf6971923207e97..34246df4ec946273d9f42e6f0848b02d8510beea 100644 (file)
--- a/builtin-pack-refs.c
+++ b/builtin-pack-refs.c
@@ -3,7 +3,7 @@
 #include "pack-refs.h"
 
 static char const * const pack_refs_usage[] = {
-       "git-pack-refs [options]",
+       "git pack-refs [options]",
        NULL
 };