Merge branch 'rs/fmt-merge-msg-string-leak-fix'

diff --git a/builtin/notes.c b/builtin/notes.c
index a2a542f82b2a3cc9ff8d4615192a406c0012d22a..1a2c7d92ad7e73246be8dc64946feb00c16f7261 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -33,7 +33,7 @@ static const char * const git_notes_usage[] = {
        N_("git notes merge --commit [-v | -q]"),
        N_("git notes merge --abort [-v | -q]"),
        N_("git notes [--ref <notes-ref>] remove [<object>...]"),
-       N_("git notes [--ref <notes-ref>] prune [-n | -v]"),
+       N_("git notes [--ref <notes-ref>] prune [-n] [-v]"),
        N_("git notes [--ref <notes-ref>] get-ref"),
        NULL
 };