Merge branch 'js/no-html-bypass-on-windows' into rt/help-unknown
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Aug 2016 18:29:07 +0000 (11:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Aug 2016 18:29:07 +0000 (11:29 -0700)
* js/no-html-bypass-on-windows:
  Revert "display HTML in default browser using Windows' shell API"

1  2 
builtin/help.c
compat/mingw.c
compat/mingw.h

diff --cc builtin/help.c
Simple merge
diff --cc compat/mingw.c
Simple merge
diff --cc compat/mingw.h
Simple merge