~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-08-10 07:12:32 UTC
  • mfrom: (2687.2.2 rename-0.19)
  • Revision ID: pqm@pqm.ubuntu.com-20070810071232-0ndzwbob5juuzaus
(mbp) rename 0.19 release to 0.90

Show diffs side-by-side

added added

removed removed

Lines of Context:
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: .*