Merge branch 'nd/daemon-informative-errors-typofix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Jan 2014 18:32:59 +0000 (10:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Jan 2014 18:32:59 +0000 (10:32 -0800)
* nd/daemon-informative-errors-typofix:
daemon: be strict at parsing parameters --[no-]informative-errors

1  2 
daemon.c
diff --cc daemon.c
Simple merge