Restart/undo conflict resolution in a single file
Found the solution here: http://gitster.livejournal.com/43665.html
git checkout -m FILE
This restores the unresolved state, including all information about parent and merge base, which allows restarting the resolution.