← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

(spiv) Tags.merge_to now updates the master branch as well,
 if any. (#603395) (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
23
23
 
24
24
from bzrlib import (
25
25
    branch,
 
26
    branchbuilder,
26
27
    bzrdir,
27
28
    conflicts,
28
 
    errors,
29
29
    merge_directive,
30
30
    osutils,
31
31
    tests,