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 2012/10/25 01:56:48 UTC

svn commit: r1401921 - /subversion/trunk/subversion/libsvn_wc/update_editor.c

Author: stsp
Date: Wed Oct 24 23:56:48 2012
New Revision: 1401921

URL: http://svn.apache.org/viewvc?rev=1401921&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
   (complete_conflict): Fix typo in comment.

Modified:
    subversion/trunk/subversion/libsvn_wc/update_editor.c

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1401921&r1=1401920&r2=1401921&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Wed Oct 24 23:56:48 2012
@@ -874,7 +874,7 @@ complete_conflict(svn_skel_t *conflict,
   SVN_ERR(svn_wc__conflict_skel_is_complete(&is_complete, conflict));
 
   if (is_complete)
-    return SVN_NO_ERROR; /* Already competed */
+    return SVN_NO_ERROR; /* Already completed */
 
   if (old_repos_relpath)
     src_left_version = svn_wc_conflict_version_create2(eb->repos_root,