Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.
The "ListOfDiffApplications" page has been changed by GabrielaGibson: http://wiki.apache.org/subversion/ListOfDiffApplications?action=diff&rev1=6&rev2=7 Comment: Added Guiffy man page # invoking guiffy after first file. exit 0 - Could not locate a man page, emailed support. + http://www.guiffy.com/help/GuiffyHelp/GuiffyCmd.html + To specify filenames including blanks, encapsulate the filename with double quotes. + To specify a UNC for a filename, use \\\\servername for the usual \\servername. + The guiffy command line interface executable on Windows is the installed file guiffy.exe + The guiffy command line interface executable on MacOS X is the installed file guiffyCL.command + The guiffy command line interface executable on Linux and Unix is the installed shell script guiffy + + Usage: + Just starts Guiffy: + guiffy [-options] + To compare files: + guiffy [-options] <1st file> <2nd file> + To compare folders: + guiffy [-options] <1st folder> <2nd folder> [parent folder] [result folder] + Note: optional parent and result folder used when launching 3-way merge from folder compare. + To Merge(2-way): + guiffy -m [-options] <1st file> <2nd file> [result file] + To SureMerge(3-way): + guiffy -s [-options] <1st file> <2nd file> <parent file> [result file] + To Automatically Save a compare as HTML: + guiffy -ahfileset.html [-options] <1st file> <2nd file> + + (list of options at the link above) + + Comment: Seeing this I'm wondering if we should allow more than one + definition in the config file, which can be changed with a switch, + and viewed on request (since everyone is forgetful at times) + Also, does giving the option on the command line override the + definition in the config file right now? =========================================================================================== Roaring Diff (Mac)
