← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testmerge3.py

  • Committer: Martin Pool
  • Date: 2005-07-05 08:37:09 UTC
  • Revision ID: mbp@sourcefrog.net-20050705083709-8a5107dea678b14a
- code to represent merges in regular text conflict form

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge3.py
76
76
 
77
77
        self.assertEquals(list(m3.merge_regions()),
78
78
                          [('a', 0, 2)])
 
79
 
 
80
        self.assertEquals(list(m3.merge_lines()),
 
81
                          ['aaa', 'bbb'])
79
82
        
80
83
    
81
84
 
128
131
                           ('unchanged', ['bbb']),
129
132
                           ])
130
133
 
 
134
        self.assertEquals(list(m3.merge_lines('<<', '--', '>>')),
 
135
                          ['aaa',
 
136
                           '<<',
 
137
                           '111',
 
138
                           '--',
 
139
                           '222',
 
140
                           '>>',
 
141
                           'bbb'])
 
142
 
131
143
 
132
144
 
133
145
class ReplaceClash(TestBase):