* subversion/svn/conflict-callbacks.c
(show_diff): Fix typo in comment.
@@ -115,7 +115,7 @@ show_diff(svn_client_conflict_t *conflict,
* 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).
*
