Author: stsp
Date: Wed Jun 3 08:58:19 2015
New Revision: 1683258
URL: http://svn.apache.org/r1683258
Log:
* subversion/libsvn_client/resolved.c: Fix a typo in comment.
Modified:
subversion/trunk/subversion/libsvn_client/resolved.c
Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1683258&r1=1683257&r2=1683258&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Wed Jun 3 08:58:19
2015
@@ -146,7 +146,7 @@ svn_client_resolve(const char *path,
}
-/*** Dealing with conflitcs. ***/
+/*** Dealing with conflicts. ***/
const char *
svn_client_conflict_get_local_abspath(svn_wc_conflict_description2_t *conflict)
