← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Tweaks from merge review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
244
244
        if self.merge_type.supports_reprocess:
245
245
            kwargs['reprocess'] = self.reprocess
246
246
        elif self.reprocess:
247
 
            raise BzrError("Reprocess is not supported for this merge"
248
 
                                  " type. %s" % self.merge_type)
 
247
            raise BzrError("Conflict reduction is not supported for merge"
 
248
                                  " type %s." % self.merge_type)
249
249
        if self.merge_type.supports_show_base:
250
250
            kwargs['show_base'] = self.show_base
251
251
        elif self.show_base: