'bzr merge' has a different opinion about the conflicts (none, and in fact no content changes caused by the merge), and there's no significant extra history here either, so rejecting.
« Back to merge proposal
'bzr merge' has a different opinion about the conflicts (none, and in fact no content changes caused by the merge), and there's no significant extra history here either, so rejecting.