391
357
self.runbzr('merge ../b -r last:1')
392
358
self.check_file_contents('goodbye', 'quux')
393
359
# Merging a branch pulls its revision into the tree
396
362
a.branch.repository.get_revision_xml(b.last_revision())
397
363
self.log('pending merges: %s', a.pending_merges())