SnapshotCM Diff/Merge

SnapshotCM 1.54 supports enternal diff and 3-way merge tool integration.

To plugin Guiffy as the external merge tool in SnapshotCM, the command is:
"C:/Program Files/Guiffy/guiffy.exe" -s -hm"Merge Result" -h1SOURCE:$(sourcelabel) -h2TARGET:$(targetlabel) -gc -gf $(source) $(target) $(base) $(output)

NOTES:

If your Guiffy install directory is NOT in your PATH, specify the full path for the Command in the above settings.
The above Command is for the guiffy.exe on Windows.
On Linux and Unix the above command is the shell script and should be specified as sh ./guiffy
Any of Guiffy's other command line options may be specified in the above Arguments before the first File parameter. For example, Command line options may be used to specify how to write EOLs in the merge result file or File Encoding formats. See Guiffy's Command Line interface.

Documentation by Guiffy Software, Inc. 2017