/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/tests/test_versionedfile.py

  • Committer: Jelmer Vernooij
  • Date: 2009-05-28 16:04:39 UTC
  • mfrom: (4387 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4405.
  • Revision ID: jelmer@samba.org-20090528160439-4z0xlrk5nejobm7q
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1152
1152
            """
1153
1153
        result = """\
1154
1154
            line 1
 
1155
<<<<<<<\x20
 
1156
            line 2
 
1157
=======
 
1158
>>>>>>>\x20
1155
1159
            """
1156
1160
        self._test_merge_from_strings(base, a, b, result)
1157
1161