← 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

  • Committer: Aaron Bentley
  • Date: 2007-03-09 21:51:41 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2330.
  • Revision ID: abentley@panoramicfeedback.com-20070309215141-wmmgb9czhi9ea14j
Change format marker to not experimental

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge_directive.py
24
24
From: J. Random Hacker <jrandom@example.com>
25
25
Subject: bar
26
26
 
27
 
# Bazaar merge directive format experimental-1
 
27
# Bazaar merge directive format 1
28
28
# revision_id: jrandom@example.com-.*
29
29
# target_branch: ../tree2
30
30
# testament_sha1: .*