It seems I was just looking in the wrong place. The solution turned out to be quite simple.
git checkout -m <file>
This returns the file to its conflicted state. I can then run git mergetool to redo the merge.
It seems I was just looking in the wrong place. The solution turned out to be quite simple.
git checkout -m <file>
This returns the file to its conflicted state. I can then run git mergetool to redo the merge.