[PATCH] git-merge-cache -q doesn't complain about failing merge program

[git.git] / diff-stages.c

diff --git a/diff-stages.c b/diff-stages.c
index cbaba55..2e9c0bc 100644 (file)
--- a/diff-stages.c
+++ b/diff-stages.c
@@ -17,7 +17,7 @@ static int diff_break_opt = -1;
 static const char *orderfile = NULL;
 static const char *diff_filter = NULL;
 
-static char *diff_stages_usage =
+static const char diff_stages_usage[] =
 "git-diff-stages [<common diff options>] <stage1> <stage2> [<path>...]"
 COMMON_DIFF_OPTIONS_HELP;