Original: The term combat (French for fight) typically refers to armed conflict between military forces in warfare, whereas the more general term "fighting" can refer to any violent conflict.
Simplified: The term "combat" typically means armed conflict between military forces in war. The more general term "fighting" can mean any violent conflict, including boxing and wrestling matches.