You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/06/13 16:44:25 UTC
svn commit: r954234 - /subversion/trunk/subversion/libsvn_subr/config_file.c
Author: stsp
Date: Sun Jun 13 14:44:24 2010
New Revision: 954234
URL: http://svn.apache.org/viewvc?rev=954234&view=rev
Log:
* subversion/libsvn_subr/config_file.c
(svn_config_ensure): Tweak documentation of the diff-extensions option.
Modified:
subversion/trunk/subversion/libsvn_subr/config_file.c
Modified: subversion/trunk/subversion/libsvn_subr/config_file.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/config_file.c?rev=954234&r1=954233&r2=954234&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/config_file.c (original)
+++ subversion/trunk/subversion/libsvn_subr/config_file.c Sun Jun 13 14:44:24 2010
@@ -981,8 +981,7 @@ svn_config_ensure(const char *config_dir
"# diff-cmd = diff_program (diff, gdiff, etc.)" NL
"### Diff-extensions are arguments passed to an external diff" NL
"### program or to Subversion's internal diff implementation." NL
- "### Set diff-extensions to override the default value of the" NL
- "### --extensions command line option." NL
+ "### Set diff-extensions to override the default arguments ('-u')." NL
"# diff-extensions = -u -p" NL
"### Set diff3-cmd to the absolute path of your 'diff3' program." NL
"### This will override the compile-time default, which is to use" NL