You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pe...@apache.org on 2011/01/25 20:53:33 UTC
svn commit: r1063429 - /subversion/trunk/subversion/libsvn_subr/config_file.c
Author: peters
Date: Tue Jan 25 19:53:33 2011
New Revision: 1063429
URL: http://svn.apache.org/viewvc?rev=1063429&view=rev
Log:
Followup r876252: Document fifth parameter passed to external merge tool.
* subversion/libsvn_subr/config_file.c
(svn_config_ensure): Tweak comment in generated .subversion/config
file to mention fifth parameter to merge-tool-cmd.
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=1063429&r1=1063428&r2=1063429&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/config_file.c (original)
+++ subversion/trunk/subversion/libsvn_subr/config_file.c Tue Jan 25 19:53:33 2011
@@ -1008,8 +1008,8 @@ svn_config_ensure(const char *config_dir
"### accepts the '--diff-program' option." NL
"# diff3-has-program-arg = [yes | no]" NL
"### Set merge-tool-cmd to the command used to invoke your external" NL
- "### merging tool of choice. Subversion will pass 4 arguments to" NL
- "### the specified command: base theirs mine merged" NL
+ "### merging tool of choice. Subversion will pass 5 arguments to" NL
+ "### the specified command: base theirs mine merged wcfile" NL
"# merge-tool-cmd = merge_command" NL
"" NL
"### Section for configuring tunnel agents." NL