331
331
If branches have diverged, you can use 'bzr merge' to pull the text changes
335
335
takes_args = ['location?']
337
def run(self, location=None, remember=False, clobber=False):
338
338
from bzrlib.merge import merge
340
340
from shutil import rmtree