The biggest problem here is that the second parent gets added before any merging
happens. Thus if a merge aborts part-way through, it gets marked as "done".

So I've made it last. Now, if merge breaks, you end up with your merged files,
your .orig files, and you can simply restart the merge. Any files that were
manually merged earlier should automerge on the second attempt.