If combat starts, can it become non-combat later in the same showdown?

A combat starts because both sides have units, then one side's unit dies before damage. Does that showdown convert into non-combat, or does it remain combat through completion?