summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-30 20:07:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-10-30 20:07:02 (GMT)
commit23d58a00e55f0e5803e190ce861c5354cf19484a (patch)
treea7d538999f104d3b6d3f6836eed28e7c0fee02b6 /builtin/merge.c
parent808d11926351018f73db69d54e5920adef578f62 (diff)
parent95261974bbc8cc1a32ed260f06a694cde86f732d (diff)
downloadgit-23d58a00e55f0e5803e190ce861c5354cf19484a.zip
git-23d58a00e55f0e5803e190ce861c5354cf19484a.tar.gz
git-23d58a00e55f0e5803e190ce861c5354cf19484a.tar.bz2
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
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions