Merged into bzr.dev 3472
We decided that the merge should not be setting the pending parent. Though it seems a reasonable number of tests did expect that behavior.
Merged into bzr.dev 3472
We decided that the merge should not be setting the pending parent. Though it seems a reasonable number of tests did expect that behavior.