Merge branch 'mk/blame-error-message'
commit23d58a00e55f0e5803e190ce861c5354cf19484a
authorJunio C Hamano <gitster@pobox.com>
Fri, 30 Oct 2015 20:07:01 +0000 (30 13:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Oct 2015 20:07:02 +0000 (30 13:07 -0700)
treea7d538999f104d3b6d3f6836eed28e7c0fee02b6
parent808d11926351018f73db69d54e5920adef578f62
parent95261974bbc8cc1a32ed260f06a694cde86f732d
Merge branch 'mk/blame-error-message'

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

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