Merge branch 'mk/blame-error-message' into maint

The error message from "git blame --contents --reverse" incorrectly
talked about "--contents --children".

* mk/blame-error-message:
blame: fix option name in error message

diff --cc builtin/blame.c
index 295ce92da5df25a9082b868e848ee9634145e636,b5474690153bae66727de6f4d44d6e395eddb9e4..6cac59c973bfcf1dc48e2a1af26375f914bb02c4
--- 1/builtin/blame.c
--- 2/builtin/blame.c
+++ b/builtin/blame.c
@@@ -2691,9 -2677,7 +2691,9 @@@ parse_done
                sb.commits.compare = compare_commits_by_commit_date;
        }
        else if (contents_from)
-               die("--contents and --children do not blend well.");
+               die("--contents and --reverse do not blend well.");
 +      else if (revs.first_parent_only)
 +              die("combining --first-parent and --reverse is not supported");
        else {
                final_commit_name = prepare_initial(&sb);
                sb.commits.compare = compare_commits_by_reverse_commit_date;