[PATCH] Better error message from checkout-cache for unmerged files.