qbzr breaks test suite

[Vincent Ladeuil]

Scary but true, fix trivial though :)

=== modified file 'lib/commands.py'
--- lib/commands.py 2008-09-30 11:03:04 +0000
+++ lib/commands.py 2008-10-01 15:08:45 +0000
@@ -536,7 +536,7 @@
         self._encoding = kw.get('encoding')
         if self._encoding:
             del kw['encoding']
- bzrlib.builtins.cmd_merge.run(self, *args, **kw)
+ return bzrlib.builtins.cmd_merge.run(self, *args, **kw)

     @install_gettext
     @report_missing_pyqt

Before patch:

bzr selftest merge
Ran 608 tests in 96.111s

FAILED (failures=6, known_failure_count=7)

After patch:

bzr selftest merge
Ran 608 tests in 103.399s

Yeah !

Thanks for qlog by the way (it forced me to keep qbzr installed and fix that bug :)