Merged PRs

dolt

9783: Bug fix: allow aborting a merge when there is a table rename
When a merge halts due to a conflict, the merge can be aborted by calling dolt_merge('--abort');, however a bug caused this to error if the merge included a table rename. The root cause of the bug was how we restore the tables to their previous values and work around ignored tables. This change alters how we restore tables – now we restore all versioned tables by reusing the pre-merge root and then applying any ignored tables.