← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Tweaks from merge review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2406
2406
        raise BzrCommandError("Show-base is not supported for this merge"
2407
2407
                              " type. %s" % merge_type)
2408
2408
    if reprocess and not merge_type.supports_reprocess:
2409
 
        raise BzrCommandError("Reprocess is not supported for this merge"
2410
 
                              " type. %s" % merge_type)
 
2409
        raise BzrCommandError("Conflict reduction is not supported for merge"
 
2410
                              " type %s." % merge_type)
2411
2411
    if reprocess and show_base:
2412
 
        raise BzrCommandError("Cannot reprocess and show base.")
 
2412
        raise BzrCommandError("Cannot do conflict reduction and show base.")
2413
2413
    try:
2414
2414
        merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2415
2415
        merger.pp = ProgressPhase("Merge phase", 5, pb)