← 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-08-26 00:10:48 UTC
  • Revision ID: mbp@sourcefrog.net-20050826001048-b84148d3ef567d0d
- fix bzr.dev branch url in tutorial
  thanks to madduck

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge3.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
 
from bzrlib.selftest import TestCaseInTempDir, TestCase
 
18
from bzrlib.selftest import InTempDir, TestCase
19
19
from bzrlib.merge3 import Merge3
20
20
 
21
21
def split_lines(t):
300
300
        self.log('merge result:')
301
301
        self.log(''.join(ml))
302
302
        self.assertEquals(ml, MERGED_RESULT)
 
303
 
 
304
 
 
305
TEST_CLASSES = [ TestMerge3 ]