/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2007-08-14 23:35:48 UTC
  • mfrom: (2698 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2699.
  • Revision ID: aaron.bentley@utoronto.ca-20070814233548-ctlr8sb1lcufb3ny
Merge bzr.dev

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: .*