From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 27 Dec 2008 22:21:24 +0000 (-0800)
Subject: Merge branch 'rs/maint-retval-fix' into maint
X-Git-Tag: v1.6.1.1~40
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f611c8c0d196a784b94ae404f920a48593930179;p=git.git

Merge branch 'rs/maint-retval-fix' into maint

* rs/maint-retval-fix:
  merge-file: handle freopen() failure
  daemon: cleanup: factor out xstrdup_tolower()
  daemon: cleanup: replace loop with if
  daemon: handle freopen() failure
---

f611c8c0d196a784b94ae404f920a48593930179