You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2014/05/07 02:38:38 UTC
svn commit: r1592927 - /subversion/trunk/tools/diff/diff3.c
Author: danielsh
Date: Wed May 7 00:38:38 2014
New Revision: 1592927
URL: http://svn.apache.org/r1592927
Log:
* tools/diff/diff3
(main): Typo fix in error message.
Modified:
subversion/trunk/tools/diff/diff3.c
Modified: subversion/trunk/tools/diff/diff3.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/diff/diff3.c?rev=1592927&r1=1592926&r2=1592927&view=diff
==============================================================================
--- subversion/trunk/tools/diff/diff3.c (original)
+++ subversion/trunk/tools/diff/diff3.c Wed May 7 00:38:38 2014
@@ -142,7 +142,7 @@ int main(int argc, const char *argv[])
conflict_latest = apr_pstrcat(pool, ">>>>>>> ", arg, SVN_VA_NULL);
else
svn_err = svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- "too many lables");
+ "too many labels");
break;
case 'E':
case 'm':