* Comedy refers to the genre of entertainment that aims to evoke laughter.
* Humor refers to the quality of being funny or amusing.
The best choice depends on the context. For example, if you're talking about the genre of comic books, then "comedy" is more appropriate. If you're talking about the overall sense of funniness in a comic, then "humor" might be better.