← 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: Canonical.com Patch Queue Manager
  • Date: 2007-07-19 20:23:07 UTC
  • mfrom: (2520.4.136 bzr.mpbundle)
  • Revision ID: pqm@pqm.ubuntu.com-20070719202307-rr3ky8d16z5v7h3e
Fix format strings

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge_directive.py
29
29
From: J. Random Hacker <jrandom@example.com>
30
30
Subject: bar
31
31
 
32
 
# Bazaar merge directive format 2 \\(Bazaar 0.18\\)
 
32
# Bazaar merge directive format 2 \\(Bazaar 0.19\\)
33
33
# revision_id: bar-id
34
34
# target_branch: ../tree2
35
35
# testament_sha1: .*