Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maint

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 2dfe6265f7df6099b51645fa67dbeeb3f4f567a4..560f6c2cc72b8f489c7f113601b464f44b6e395a 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -440,7 +440,7 @@ static int batch_objects(struct batch_options *opt)
 }
 
 static const char * const cat_file_usage[] = {
-       N_("git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<type>|--textconv) <object>"),
+       N_("git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv) <object>"),
        N_("git cat-file (--batch | --batch-check) [--follow-symlinks]"),
        NULL
 };