Merge branch 'master' into next
commit5ecd9ab75d3beb2403db428e21e8edaed64c32c6
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Aug 2010 19:56:11 +0000 (20 12:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Aug 2010 19:56:11 +0000 (20 12:56 -0700)
treeed5527232d5392eb005208a35a2ec20856718a9b
parentb1a242af4d8ff8488b10887ca729c15a8a52aa27
parentf9c33605700e37b75279ed6ce4bffaad3eb0cf10
Merge branch 'master' into next

* master:
  builtin/checkout: Fix message when switching to an existing branch
  xmalloc: include size in the failure message
builtin/checkout.c