Missing the import of merge
$ bzr diff
*** modified file 'bzrlib/commands.py'
--- bzrlib/commands.py
+++ bzrlib/commands.py
@@ -1140,6 +1140,7 @@
takes_options = ['revision']
def run(self, revision=-1):
+ from bzrlib.merge import merge
merge(('.', revision), parse_spec('.'),
check_clean=False,
ignore_zero=True)
--
William Dodé - http://flibuste.net