Skip to content

Commit a5bf19b

Browse files
committed
Merge 'kblees/kb/symlinks' into HEAD
2 parents 875e7be + dd4405f commit a5bf19b

File tree

9 files changed

+498
-244
lines changed

9 files changed

+498
-244
lines changed

builtin/help.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -379,17 +379,10 @@ static void get_html_page_path(struct strbuf *page_path, const char *page)
379379
free(to_free);
380380
}
381381

382-
/*
383-
* If open_html is not defined in a platform-specific way (see for
384-
* example compat/mingw.h), we use the script web--browse to display
385-
* HTML.
386-
*/
387-
#ifndef open_html
388382
static void open_html(const char *path)
389383
{
390384
execl_git_cmd("web--browse", "-c", "help.browser", path, (char *)NULL);
391385
}
392-
#endif
393386

394387
static void show_html_page(const char *git_cmd)
395388
{

0 commit comments

Comments
 (0)