Merge branch 'sg/commit-cleanup-scissors'
commit07528be1018b72e463404624b8752ead7eb0eb8d
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:55 +0000 (24 12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:55 +0000 (24 12:21 -0700)
tree5d08b81961e129a3d8c42f3ecd23ceec83b08f1b
parent712b351bd37d4e4676d1165993cad4cc2176b346
parentfbfa0973faf47e475854a8919097d5db29acf536
Merge branch 'sg/commit-cleanup-scissors'

"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
t/t7502-commit.sh
wt-status.c