Merge branch 'jk/daemon-msgs'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 23:04:32 +0000 (16:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 23:04:32 +0000 (16:04 -0700)
commite75a59adfcc4fd048690e5b25f9a8c31d8011d53
tree81d726bd68ab7d9dc149c82955fc0cc363fa9486
parent1ad4b17b069a7b692ab801bda37c5ab35ef0208e
parentd5570f4d2cb29f3db9f69ff5fcde0a7d54ad2696
Merge branch 'jk/daemon-msgs'

* jk/daemon-msgs:
  daemon: give friendlier error messages to clients

Conflicts:
daemon.c
daemon.c