From 9079d26c8532bdeb95c6913411f9b5d647a3aac3 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 Oct 2011 21:21:14 -0700
Subject: [PATCH] Fix mismerge at 415cf53

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 daemon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/daemon.c b/daemon.c
index 95b7df5d8d..fa283003ea 100644
--- a/daemon.c
+++ b/daemon.c
@@ -20,7 +20,7 @@
 static int log_syslog;
 static int verbose;
 static int reuseaddr;
-static int informative_errors = 1;
+static int informative_errors;
 
 static const char daemon_usage[] =
 "git daemon [--verbose] [--syslog] [--export-all]\n"