Commits

Anonymous committed 22804f3

visdiff: make direct 3-way merge diff work again

Comments (0)

Files changed (1)

tortoisehg/hgtk/visdiff.py

     # Disable 3-way merge if there is only one parent or no tool support
     do3way = bool(mergeopts) and ctx1b is not None
     if do3way:
-        args = ' '.join(mergeopts)
+        args = mergeopts
     else:
-        args = ' '.join(diffopts)
+        args = diffopts
 
-    def dodiff(tmproot, diffcmd, args):
+    def dodiff(tmproot):
         fns_and_mtime = []
 
         # Always make a copy of ctx1a (and ctx1b, if applicable)
                        plabel1=label1a, plabel2=label1b,
                        ancestor=dira, alabel=labela,
                        clabel=label2, child=dir2)
-        launchtool(diffcmd, diffopts, replace, True)
+        launchtool(diffcmd, args, replace, True)
 
         # detect if changes were made to mirrored working files
         for copy_fn, working_fn, mtime in fns_and_mtime:
 
     def dodiffwrapper():
         try:
-            dodiff(tmproot, diffcmd, args)
+            dodiff(tmproot)
         finally:
             ui.note(_('cleaning up temp directory\n'))
             shutil.rmtree(tmproot)