← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_textmerge.py

  • Committer: Martin Pool
  • Date: 2006-05-17 04:01:38 UTC
  • mto: (1704.2.17 bzr.mbp.integration)
  • mto: This revision was merged to the branch mainline in revision 1710.
  • Revision ID: mbp@sourcefrog.net-20060517040138-2cdf4e74bbc40afc
Fix setup.py to install launchpad plugin

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_textmerge.py
26
26
    def test_conflict(self):
27
27
        lines_a = "a\nb\nc\nd\ne\nf\ng\nh\n".splitlines(True)
28
28
        lines_b = "z\nb\nx\nd\ne\ne\nf\ng\ny\n".splitlines(True)
29
 
        expected = "<\na\n=\nz\n>\nb\n<\nc\n=\nx\n>\nd\ne\n<\n=\ne\n>\nf\n"\
 
29
        expected = "<\na\n=\nz\n>\nb\n<\nc\n=\nx\n>\nd\n<\n=\ne\n>\ne\nf\n"\
30
30
                   "g\n<\nh\n=\ny\n>\n"
31
31
        m2 = Merge2(lines_a, lines_b, '<\n', '>\n', '=\n')
32
32
        mlines= m2.merge_lines()[0]