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/04/21 10:57:31 UTC
svn commit: r1740259 -
/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Author: stsp
Date: Thu Apr 21 08:57:31 2016
New Revision: 1740259
URL: http://svn.apache.org/viewvc?rev=1740259&view=rev
Log:
* subversion/tests/libsvn_client/conflicts-test.c
(test_option_merge_incoming_added_dir_ignore): Fix 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=1740259&r1=1740258&r2=1740259&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Thu Apr 21 08:57:31 2016
@@ -603,7 +603,7 @@ test_option_merge_incoming_added_dir_ign
SVN_ERR(svn_client_conflict_get(&conflict, sbox_wc_path(b, new_dir_path),
ctx, b->pool, b->pool));
- /* The file should not be in conflict. */
+ /* The directory should not be in conflict. */
SVN_ERR(svn_client_conflict_get_conflicted(&text_conflicted,
&props_conflicted,
&tree_conflicted,