From 9167eb311905dc0547ce206f6c9f060d97ab144f Mon Sep 17 00:00:00 2001 From: Joseph Reagle Date: Mon, 7 Feb 2011 11:10:27 -0500 Subject: [PATCH] fix command that was preventing 'not a mw repo' check --- src/mw/clicommands.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py index ff56259..aec3f24 100644 --- a/src/mw/clicommands.py +++ b/src/mw/clicommands.py @@ -254,11 +254,12 @@ class DiffCommand(CommandBase): 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() + self.merge_tool = self.metadir.config.get('merge', 'tool') status = self.metadir.working_dir_status() for filename in status: if status[filename] == 'M': -- 2.30.2