Use native split/merge/rebase.