Diff and 3-way merge Settings for Mercurial?

[bikeoid]

 I have found the DifZilla command line arguments for Diff, but have not for merge.  Has anyone set up SlickEdit for use with Mercurial? 

Can the 3-way merge vsmerge be called from the command line?

Thanks,

[Dan]

Can the 3-way merge vsmerge be called from the command line?

Yes.  Use "vsmerge /?" to see how to specify the arguments... but since we're here anyway:

vsmerge

Usage:

vsmerge [options] <basefile> <revision1file> <revision2file> <outputfile>
   options are as follows:
      -smart:   Attempt to resolve simple conficts
      -quiet:   Supress "No conficts detected" message
      -showchanges:   Force user to merge in non-conflict changes
      -ignorespaces:   Ignore spaces in the files being merged
Usage:
   To launch 3-way merge dialog:

   vsmerge


   A SlickEdit configuration path may be specified with a -sc option
   ex:
      vsmerge -sc <configpath> ...