Merge branch 'sg/commit-cleanup-scissors' into next
commit988e23da8739200e581ab0cfa18234e030477080
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:43:33 +0000 (16 14:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:43:33 +0000 (16 14:43 -0700)
tree27acdef59e563fbd8854e63b2cba33c68fe74deb
parentff837056a5c79fb31ae2ac675a5cddf96c045d70
parentfbfa0973faf47e475854a8919097d5db29acf536
Merge branch 'sg/commit-cleanup-scissors' into next

"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