Merge branch 'ew/svn-maint-fixes'

diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 9200069363ff016d167f6885688650158c12e507..8ed2eb8813a442b64c8f43ed23acbdbd1c0dd452 100644 (file)
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -11,7 +11,7 @@
 #include "submodule.h"
 
 static const char diff_files_usage[] =
-"git diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]"
+"git diff-files [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]"
 COMMON_DIFF_OPTIONS_HELP;
 
 int cmd_diff_files(int argc, const char **argv, const char *prefix)