/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/blackbox/test_commit.py

  • Committer: Gerard Krol
  • Date: 2010-01-29 21:54:48 UTC
  • mto: (5020.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: gerard_@gna.org-20100129215448-n2v1yimzjpoov8hx
FIXED

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
362
362
        a_file = file('u1/hosts', 'rt')
363
363
        text = a_file.read()
364
364
        a_file.close()
365
 
        self.assertEqual(text, '<<<<<<< TREE\naltered in u2=======\nfirst offline change in u1>>>>>>> MERGE-SOURCE\n')
 
365
        self.assertEqual(text, '<<<<<<< TREE\nfirst offline change in u1=======\naltered in u2>>>>>>> MERGE-SOURCE\n')
366
366
 
367
367
        self.run_bzr('resolved u1/hosts')
368
368
        # add a text change here to represent resolving the merge conflicts in