Merge branch 'js/no-html-bypass-on-windows' into maint
commitba22efd8f5d9bd946925e72b5e6ede91ce2ec9be
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 04:35:55 +0000 (8 21:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 04:35:55 +0000 (8 21:35 -0700)
treed3ea10c950539813a629e01cb4e0c00ee6f41317
parentbde42f081e68030505f59186ae036b2bbbd94ce8
parent6db5967d4e6640c5a3ee3cde151c5fdde5ab508f
Merge branch 'js/no-html-bypass-on-windows' into maint

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