/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/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/merge_directive.py
47
47
    directly using the standard patch program.
48
48
    """
49
49
 
50
 
    _format_string = 'Bazaar merge directive format experimental-1'
 
50
    _format_string = 'Bazaar merge directive format 1'
51
51
 
52
52
    def __init__(self, revision_id, testament_sha1, time, timezone,
53
53
                 target_branch, patch=None, patch_type=None,