Merge branch 'jc/unpack-trees-reword'
authorJunio C Hamano <gitster@pobox.com>
Sun, 25 May 2008 20:38:27 +0000 (13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 25 May 2008 20:38:27 +0000 (13:38 -0700)
* jc/unpack-trees-reword:
  unpack-trees: allow Porcelain to give different error messages

1  2 
builtin-checkout.c

Simple merge