> 8 + a_file = file('u1/hosts', 'rt') > 9 + text = a_file.read() > 10 + a_file.close() > 11 + self.assertEqual(text, '<<<<<<< TREE\nfirst offline change in > u1=======\naltered in u2>>>>>>> MERGE-SOURCE\n') > 12 + > > > ^- I think this is better written as > > self.assertFileEqual('u1/hosts', '<<<<<< ...')
Fixed
« Back to merge proposal
> 8 + a_file = file('u1/hosts', 'rt') l(text, '<<<<<<< TREE\nfirst offline change in Equal(' u1/hosts' , '<<<<<< ...')
> 9 + text = a_file.read()
> 10 + a_file.close()
> 11 + self.assertEqua
> u1=======\naltered in u2>>>>>>> MERGE-SOURCE\n')
> 12 +
>
>
> ^- I think this is better written as
>
> self.assertFile
Fixed