Fix mismerge at 415cf53

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2011-10-16 21:21:14 -07:00
parent 6555a078de
commit 9079d26c85

View File

@@ -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"