From: Junio C Hamano Date: Fri, 21 Oct 2011 23:04:32 +0000 (-0700) Subject: Merge branch 'jk/daemon-msgs' X-Git-Tag: v1.7.8-rc0~28 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e75a59adfcc4fd048690e5b25f9a8c31d8011d53;p=git.git Merge branch 'jk/daemon-msgs' * jk/daemon-msgs: daemon: give friendlier error messages to clients Conflicts: daemon.c --- e75a59adfcc4fd048690e5b25f9a8c31d8011d53