You have two sets of merge conflicts in here (I'm surprised bzr let you commit those without some effort, actually). Could you please resolve them?
« Back to merge proposal
You have two sets of merge conflicts in here (I'm surprised bzr let you commit those without some effort, actually). Could you please resolve them?