Merge branch 'jc/error-message-in-cherry-pick'
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Feb 2008 00:46:27 +0000 (16:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Feb 2008 00:46:27 +0000 (16:46 -0800)
commitc21fdf3b60884222d5d28a09d854cef83c3e60ac
tree607cc5260d49966c9e2dea0d504ed251b74c2608
parente0197c9aae39b0f1ba6c21d1f6d0bae5de03a44d
parent45525bd022dda75ec935c9c579e452577dcfd31f
Merge branch 'jc/error-message-in-cherry-pick'

* jc/error-message-in-cherry-pick:
  Make error messages from cherry-pick/revert more sensible
cache-tree.c