experiment with jj style conflicted commits

[schacon]

This PR is an experiment with performing our rebasing operation in a similar manner to how jj does it, where instead of stopping, we record the state of the conflict in the commit tree and headers, then keep going.