← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Added early-exit message in merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
317
317
    merger.check_basis(check_clean)
318
318
    merger.set_other(other_revision)
319
319
    merger.set_base(base_revision)
 
320
    if merger.base_rev_id == merger.other_rev_id:
 
321
        note('Nothing to do.')
 
322
        return 0
320
323
    merger.backup_files = backup_files
321
324
    merger.merge_type = merge_type 
322
325
    merger.set_interesting_files(file_list)