← Back to branch summary

~abentley/bzr/status

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_versionedfile.py

  • Committer: Aaron Bentley
  • Date: 2009-05-05 18:16:33 UTC
  • mfrom: (1731.1744.1078 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1931.
  • Revision ID: aaron@aaronbentley.com-20090505181633-3qtq1skwjzed0kug
Merge bzr.dev into composite-tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_versionedfile.py
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