From ff13396926f3352d9e29c0663154918297dc5af7 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 03 Sep 2007 21:00:06 +0000
Subject: Merge branch 'jo/dirlink'

* jo/dirlink:
  Rename dirlink to gitlink.

Conflicts:

	ui-tree.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
(limited to 'html.c')

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("-");
--
cgit v0.9.0.2