Andrew's git / gitweb.git / diff
?
Merge branch 'js/no-html-bypass-on-windows' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 04:35:55 +0000 (21:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Sep 2016 04:35:55 +0000 (21:35 -0700)
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"

1  2 
builtin/help.c patch | diff1 | diff2 | blob | history
compat/mingw.c patch | diff1 | diff2 | blob | history
compat/mingw.h patch | diff1 | diff2 | blob | history
diff --cc builtin/help.c
Simple merge
diff --cc compat/mingw.c
Simple merge
diff --cc compat/mingw.h
Simple merge