diff options
Diffstat (limited to 'becommands/merge.py')
| -rw-r--r-- | becommands/merge.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/becommands/merge.py b/becommands/merge.py index 8cf7e2f..ac09b40 100644 --- a/becommands/merge.py +++ b/becommands/merge.py @@ -19,7 +19,8 @@ from libbe import cmdutil, bugdir import os, copy __desc__ = __doc__ -def execute(args, manipulate_encodings=True, restrict_file_access=False): +def execute(args, manipulate_encodings=True, restrict_file_access=False, + dir="."): """ >>> from libbe import utility >>> bd = bugdir.SimpleBugDir() @@ -134,7 +135,8 @@ def execute(args, manipulate_encodings=True, restrict_file_access=False): raise cmdutil.UsageError("Too many arguments.") bd = bugdir.BugDir(from_disk=True, - manipulate_encodings=manipulate_encodings) + manipulate_encodings=manipulate_encodings, + root=dir) bugA = cmdutil.bug_from_id(bd, args[0]) bugA.load_comments() bugB = cmdutil.bug_from_id(bd, args[1]) |