Author: stsp
Date: Tue Oct 11 15:43:14 2016
New Revision: 1764272
URL: http://svn.apache.org/viewvc?rev=1764272&view=rev
Log:
On the resolve-incoming-add branch:
* subversion/libsvn_client/conflicts-test.c
(test_merge_incoming_added_dir_merge2): Sync docstring with reality.
Modified:
subversion/branches/resolve-incoming-add/subversion/tests/libsvn_client/conflicts-test.c
Modified:
subversion/branches/resolve-incoming-add/subversion/tests/libsvn_client/conflicts-test.c
URL:
http://svn.apache.org/viewvc/subversion/branches/resolve-incoming-add/subversion/tests/libsvn_client/conflicts-test.c?rev=1764272&r1=1764271&r2=1764272&view=diff
==============================================================================
---
subversion/branches/resolve-incoming-add/subversion/tests/libsvn_client/conflicts-test.c
(original)
+++
subversion/branches/resolve-incoming-add/subversion/tests/libsvn_client/conflicts-test.c
Tue Oct 11 15:43:14 2016
@@ -1216,8 +1216,7 @@ test_merge_incoming_added_dir_merge(cons
return SVN_NO_ERROR;
}
-/* Same test as above, but with an additional file change on the trunk
- * which makes resolution work as expected. */
+/* Same test as above, but with an additional file change on the trunk. */
static svn_error_t *
test_merge_incoming_added_dir_merge2(const svn_test_opts_t *opts,
apr_pool_t *pool)
