Merge branch 'em/newer-freebsd-shells-are-fine-with-returns'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:52 +0000 (09:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:52 +0000 (09:56 -0700)
Comments about misbehaving FreeBSD shells have been clarified with
the version number (9.x and before are broken, newer ones are OK).

* em/newer-freebsd-shells-are-fine-with-returns:
rebase: update comment about FreeBSD /bin/sh

1  2 
git-rebase--interactive.sh
git-rebase--merge.sh
Simple merge
Simple merge