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 2016/11/29 09:27:07 UTC
svn commit: r1771866 -
/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Author: stsp
Date: Tue Nov 29 09:27:07 2016
New Revision: 1771866
URL: http://svn.apache.org/viewvc?rev=1771866&view=rev
Log:
* libsvn_client/conflicts-test.c
(create_wc_with_file_add_vs_file_add_update_conflict): Fix typo in comment.
Modified:
subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Modified: subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c?rev=1771866&r1=1771865&r2=1771866&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Tue Nov 29 09:27:07 2016
@@ -3304,7 +3304,7 @@ create_wc_with_file_add_vs_file_add_upda
/* Update into the past. */
SVN_ERR(sbox_wc_update(b, "", 1));
- /* Add a differnt file and commit. */
+ /* Add a different file and commit. */
new_file_path = svn_relpath_join(trunk_path, new_file_name, b->pool);
SVN_ERR(sbox_file_write(b, new_file_path,
"This is a different new file on the trunk\n"));