← 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

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge_directive.py
25
25
    )
26
26
 
27
27
 
28
 
EMAIL1 = """To: pqm@example.com
29
 
From: J. Random Hacker <jrandom@example.com>
 
28
EMAIL1 = """From: "J. Random Hacker" <jrandom@example.com>
30
29
Subject: bar
 
30
To: pqm@example.com
 
31
User-Agent: Bazaar \(.*\)
31
32
 
32
33
# Bazaar merge directive format 2 \\(Bazaar 0.19\\)
33
34
# revision_id: bar-id