Code

Make <identifier> lowercase as per CodingGuidelines
[git.git] / builtin / merge.c
index a682043fe5b91317bd7e998fbb95afc9b3ccf368..7b0b4d52864a57d2a6ac841ea3ab19bdc67d8ed4 100644 (file)
@@ -194,7 +194,7 @@ static struct option builtin_merge_options[] = {
                "merge strategy to use", option_parse_strategy),
        OPT_CALLBACK('X', "strategy-option", &xopts, "option=value",
                "option for selected merge strategy", option_parse_x),
-       OPT_CALLBACK('m', "message", &merge_msg, "MESSAGE",
+       OPT_CALLBACK('m', "message", &merge_msg, "message",
                "merge commit message (for a non-fast-forward merge)",
                option_parse_message),
        OPT__VERBOSITY(&verbosity),