← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/apply_bundle.py

remove all trailing whitespace from bzr source

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/apply_bundle.py
44
44
        pb.finished()
45
45
 
46
46
 
47
 
def merge_bundle(reader, tree, check_clean, merge_type, 
 
47
def merge_bundle(reader, tree, check_clean, merge_type,
48
48
                    reprocess, show_base, change_reporter=None):
49
49
    """Merge a revision bundle into the current tree."""
50
50
    pb = bzrlib.ui.ui_factory.nested_progress_bar()