Samurai after comparing the imagery of the two.
They're not comparable despite both being warrior classes. When I think of a fighter, I think of an an unsanctioned knight or a footsoldier from a militia - some sort of inexperienced infantry. OTOH, a samurai has years of battle experience, always carried two swords at their hips, enjoyed high social status if they were sanctioned, and had extreme loyalty to their clan and lord.
Some samurai either randomly murdered other people randomly to test their skills or had to be prepared against attackers. A more equal comparison would be between specific experienced fighters like knights, Vikings, Spartans, gladiators, apaches, etc.
Anyway, I'd expect fighters to be able to wield a variety of general medieval weapons except for specialty weapons like swords (greatsword, rapier, glaive, shortsword), daggers, spears (pikes, lances), clubs / maces, axes, shields, bows, and javelins. I'd imagine they'd know their formations by heart, to boost their party's performances through warcries, and some basic first aid.
For samurai, they'd use swords (tachi, katana, wakizashi, tanto), longbows, spears (yari, naginata), arquebuses (tanegashima), cannons, staves, and chained sickles. They also used cavalry extensively during warfare. Typical abilities would include
iaijustu (quickdraw). Famous techniques are the
Sasaki's tsubame gaeshi (two cuts immediately following each other),
Miyamoto's dual-wielding techniques, and
the concept of defeating your opponent with one blow or strike. And a samurai would probably never want to be revived since it'd be disgraceful to live on knowing they lost in a battle that should've killed them.