725
725
assert '|||||||' not in conflict_text
726
726
assert 'hi world' not in conflict_text
728
730
self.runbzr('remerge hello --merge-type weave', retcode=1)
729
731
assert os.path.exists('hello.OTHER')
730
733
file_id = self.runbzr('file-id hello')
731
734
file_id = self.runbzr('file-id hello.THIS', retcode=3)
732
735
self.runbzr('remerge --merge-type weave', retcode=1)