Merge branch 'js/no-html-bypass-on-windows'
commit13e11ff707b18599dc94c25885b33b0c514b1c17
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2016 20:55:06 +0000 (25 13:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2016 20:55:06 +0000 (25 13:55 -0700)
tree7c44e79239ea5bda41ec13c87e23a8a8e6f1a681
parenta1f0b4e286a81898b70628c5df85bebec653deab
parent6db5967d4e6640c5a3ee3cde151c5fdde5ab508f
Merge branch 'js/no-html-bypass-on-windows'

On Windows, help.browser configuration variable used to be ignored,
which has been corrected.

* js/no-html-bypass-on-windows:
  Revert "display HTML in default browser using Windows' shell API"
builtin/help.c
compat/mingw.c
compat/mingw.h