Rafael Garcia-Suarez cbce6c0be3 Clarify commit error message for unmerged files ...

Currently, trying to use git-commit with unmerged files in the index
will show the message "Error building trees", which can be a bit
obscure to the end user. This patch makes the error message clearer, and
consistent with what git-write-tree reports in a similar situation.

Signed-off-by: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

2008-09-29 09:13:20 -07:00

28 KiB

Raw Permalink Blame History

View Raw