Merge branch 'jc/unpack-trees-reword'
commita24d287fb305949d9eb534bf3216c0c6a7b4392f
authorJunio C Hamano <gitster@pobox.com>
Sun, 25 May 2008 20:38:27 +0000 (25 13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 25 May 2008 20:38:27 +0000 (25 13:38 -0700)
tree3c6c6087fd6d50def5c104332e19d3550df359b0
parent29313449f726f13ecc562cea9856645eade8e3e9
parent8ccba008ee3e0b0582e64cb23ae4ebf734b9f75b
Merge branch 'jc/unpack-trees-reword'

* jc/unpack-trees-reword:
  unpack-trees: allow Porcelain to give different error messages
builtin-checkout.c