A tool which can solve this sort of problem is
git-rerere, but it needs to record the original conflict resolution so you'll have to do the conflict resolution one more time.