Merge branch 'jo/dirlink'

* jo/dirlink:
  Rename dirlink to gitlink.

Conflicts:

	ui-tree.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 file changed, 1 insertion, 1 deletion

diff --git a/html.c b/html.c
index 33a956f..76fa6c4 100644
--- a/html.c
+++ b/html.c
@@ -158,7 +158,7 @@ void html_filemode(unsigned short mode)
 		html("d");
 	else if (S_ISLNK(mode))
 		html("l");
-	else if (S_ISDIRLNK(mode))
+	else if (S_ISGITLINK(mode))
 		html("m");
 	else
 		html("-");