Author: luke1410
Date: Thu Nov 23 17:11:57 2017
New Revision: 1816174
URL: http://svn.apache.org/viewvc?rev=1816174&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(show_diff): Fix typo in comment.
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1816174&r1=1816173&r2=1816174&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Nov 23 17:11:57
2017
@@ -115,7 +115,7 @@ show_diff(svn_client_conflict_t *conflic
* as it appears after the merge operation).
*
* For conflicts recorded by the 'update' and 'switch' operations,
- * show a diff beween 'theirs' (the new pristine version of the
+ * show a diff between 'theirs' (the new pristine version of the
* file) and 'merged' (the version of the file as it appears with
* local changes merged with the new pristine version).
*
