Merged interactive email interface

1 files changed, 4 insertions, 3 deletions

diff --git a/becommands/merge.py b/becommands/merge.py
index 633067c..6651869 100644
--- a/becommands/merge.py
+++ b/becommands/merge.py
@@ -18,7 +18,7 @@ from libbe import cmdutil, bugdir
 import os, copy
 __desc__ = __doc__
 
-def execute(args, test=False):
+def execute(args, manipulate_encodings=True):
     """
     >>> from libbe import utility
     >>> bd = bugdir.simple_bug_dir()
@@ -37,7 +37,7 @@ def execute(args, test=False):
     >>> dummy = dummy.new_reply("1 2 3 4")
     >>> dummy.time = 2
     >>> os.chdir(bd.root)
-    >>> execute(["a", "b"], test=True)
+    >>> execute(["a", "b"], manipulate_encodings=False)
     Merging bugs a and b
     >>> bd._clear_bugs()
     >>> a = bd.bug_from_shortname("a")
@@ -133,7 +133,8 @@ def execute(args, test=False):
         help()
         raise cmdutil.UsageError("Too many arguments.")
     
-    bd = bugdir.BugDir(from_disk=True, manipulate_encodings=not test)
+    bd = bugdir.BugDir(from_disk=True,
+                       manipulate_encodings=manipulate_encodings)
     bugA = cmdutil.bug_from_shortname(bd, args[0])
     bugA.load_comments()
     bugB = cmdutil.bug_from_shortname(bd, args[1])