Hi.
Julian Foad wrote:
[...]
>
> diff (GNU diffutils) 2.8.1:
> Options such as --line-format may contain arbitrary characters
> (spaces, quotes, etc.).
> File name arguments may be alone or appended to options like
> "--from-file=".
> Labels may be given after "-L " or "--label=".
>
> pdiff 0.4 (GNU a2ps 4.13)
> Some options may be required to come AFTER the file name arguments.
> Labels cannot be used.
>
> zdiff (gzip 1.3)
> Passes options on to "diff"; generates new temporary file names to
> pass on to "diff" so the "--label=" option is important.
> Cannot handle options that take an argument as a separate word (e.g.
> -L label) but can handle single-word options (e.g. --label=label).
>
Please don't forget the Windows diff tools.
For example:
* WinMerge (http://winmerge.sourceforge.net/)
A free, open-source diff/merge tool based on GNU diff code.
* CSDiff (http://www.componentsoftware.com/products/csdiff/index.htm)
The diff tool from Component Software.
* Araxis Diff (http://www.araxis.com/merge/)
A commercial diff/merge tool which even support 3-way diffs.
In my oppinion the most powerfull is Araxis merge.
The commandline syntax for Araxis merge is:
compare [/? | /h] [/wait] [/aN] [/swap] [/max]
[[/titleN:"<NthFileTitle>"]...] [/2 | /3] <firstFile> <secondFile>
[<thirdFile>] [<mergedOutputFile>]
Ciao, Olli
--og
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jun 30 22:56:07 2003