← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merged bzr.dev and updated NEWS with a better description of changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge_directive.py
30
30
To: pqm@example.com
31
31
User-Agent: Bazaar \(.*\)
32
32
 
33
 
# Bazaar merge directive format 2 \\(Bazaar 0.19\\)
 
33
# Bazaar merge directive format 2 \\(Bazaar 0.90\\)
34
34
# revision_id: bar-id
35
35
# target_branch: ../tree2
36
36
# testament_sha1: .*