Merge branch 'js/unzip-in-usr-bin-workaround'
commitd008809bb5d1f9a669ee89b77b3a4b6bb7905009
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Feb 2017 21:36:55 +0000 (2 13:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Feb 2017 21:36:55 +0000 (2 13:36 -0800)
tree63b808e2691b9b41ea4a52e372bbe5c234649ba8
parentd3a0172a824657640b1ebcb49f18d19b69095423
parentd98b2c5fce0ae4ee3fbe34037798460d59e28432
Merge branch 'js/unzip-in-usr-bin-workaround'

Test tweak for FreeBSD where /usr/bin/unzip is unsuitable to run
our tests but /usr/local/bin/unzip is usable.

* js/unzip-in-usr-bin-workaround:
  test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/