On Thursday 06 May 2004 19:45, Etienne URBAH wrote:
> This 'Subversion' tool permits to specify any program to display
> differences, and uses following options of the Linux 'diff' tool :
> -u Use the unified output format
> -L label Use label instead of the file name in the headers
>...
> So the 'kdiff3' tool should accept (and ignore) the option '-u', and
> honor the option '-L'.
>
I'll include the change in the next version of KDiff3.
Since KDiff3 already supports changing the label with the --fname
option you can already achieve the wanted effect by patching the
file main.cpp like this:
@@ -39,3 +39,5 @@
{ "qall", I18N_NOOP("Don't solve conflicts automatically. (For compatibility...)"), 0 },
+ { "L", 0, 0 },
{ "fname alias", I18N_NOOP("Visible name replacement. Supply this once for every input."), 0 },
+ { "u", I18N_NOOP("Has no effect. For compatibility with certain tools."),0 },
#ifdef _WIN32
Joachim
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat May 22 16:59:51 2004