Merge branch 'sg/commit-cleanup-scissors' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 17:41:30 +0000 (10:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 17:41:30 +0000 (10:41 -0700)
commita94594dcf7522652363773c06e1ff617914dffe8
tree26e106482d98545d8e6d4cb4cb8da48dee14e877
parentca00f80b58d679e59fc271650f68cd25cdb72b09
parentfbfa0973faf47e475854a8919097d5db29acf536
Merge branch 'sg/commit-cleanup-scissors' into maint

"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