Merge branch 'sg/commit-cleanup-scissors'
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:55 +0000 (12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:55 +0000 (12:21 -0700)
"git commit --cleanup=scissors" was not careful enough to protect
against getting fooled by a line that looked like scissors.

* sg/commit-cleanup-scissors:
commit: cope with scissors lines in commit message

No differences found