Merge branch 'jc/unpack-trees-reword' into next
commit4e78d9ee443a0d2c8987ea74e308428f16b1282a
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 May 2008 22:26:12 +0000 (21 15:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 May 2008 22:26:12 +0000 (21 15:26 -0700)
tree105fd5436ef4610ecbd50213da034ab218be6702
parent010159caaea60f38a529f45d2c077ce31c13eace
parent8ccba008ee3e0b0582e64cb23ae4ebf734b9f75b
Merge branch 'jc/unpack-trees-reword' into next

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