fix command that was preventing 'not a mw repo' check

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index ff5625989153ad0df732acb6d8bf70fdf438406d..aec3f24be9edb845fe48a76f89b79d56ed96fb98 100644 (file)
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -254,11 +254,12 @@ class DiffCommand(CommandBase):
 
 class MergeCommand(CommandBase):
     def __init__(self):
 
 class MergeCommand(CommandBase):
     def __init__(self):

-        CommandBase.__init__(self, 'merge', 'merge local and wiki copies')
-        self.merge_tool = self.metadir.config.get('merge', 'tool')
+        usage = '[FILES]'
+        CommandBase.__init__(self, 'merge', 'merge local and wiki copies', usage)

 
     def _do_command(self):
         self._die_if_no_init()
 
     def _do_command(self):
         self._die_if_no_init()

+        self.merge_tool = self.metadir.config.get('merge', 'tool')

         status = self.metadir.working_dir_status()
         for filename in status:
             if status[filename] == 'M':
         status = self.metadir.working_dir_status()
         for filename in status:
             if status[filename] == 'M':