Merge branch 'rs/maint-retval-fix' into maint
commitf611c8c0d196a784b94ae404f920a48593930179
authorJunio C Hamano <gitster@pobox.com>
Sat, 27 Dec 2008 22:21:24 +0000 (27 14:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 27 Dec 2008 22:21:24 +0000 (27 14:21 -0800)
tree6c828c6004dcf9a8a542675f320d0c98e8297bb3
parentfcd3549ef239378d1d2ca11df9e8c91f7fa0ab2e
parent4deba8b7798aac52e33aa8e1c49a8cdc0940ac36
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