Index: project_faq.html =================================================================== --- project_faq.html (revision 11235) +++ project_faq.html (working copy) @@ -163,6 +163,8 @@
When using an external diff command, subversion builds a fairly +complicated command line. First is the specified --diff-cmd. Next comes +the specified --extensions (although empty --extensions are ignored), or +'-u' if --extensions is unspecified (or specified as ''). Third and +fourth, Subversion passes a '-L' and the first file's label (e.g. +"project_issues.html (revision 11209)"). Fifth and sixth are another +'-L' and the second label. Seventh and eighth are the first and second +file names (e.g. ".svn/text-base/project_issues.html.svn-base" and +".svn/tmp/project_issues.html.tmp").
+ +If your preferred diff command does not support these arguments, you +may need to create a small wrapper script to discard arguments and just +use the last couple file paths.
+ +Warning: Beware that Subversion does not expect the external diff +program to change the files it receives, and doing so may scramble the +working copy.
+ +For further information, see issue +#2044.
+ +