Spartans had a type of spear/sword fighting put into the original pentathlon in the 500's B.C., as I recall. So, yeah. It was actually part of the original Olympics, so far as the pentathlon was concerned.
Though I do seem to remember that the sword was only used in the event of the spear breaking. And the 776 B.C. Olympics consisted of one event, the straight 400 m dash.
Justice is only useful when power is useless.-Socrates, the Republic