Each Side knows the marker that follows it.
Test conflict resolution behavior for rebases.
Use followingMarker in @combineSides.
Merge pull request #65 from smashwilson/adv-resolve-during-rebase

Resolve ours-then-theirs and theirs-then-ours correctly during rebases