Author: stsp
Date: Sun Oct 16 12:05:40 2016
New Revision: 1765145
URL: http://svn.apache.org/viewvc?rev=1765145&view=rev
Log:
* subversion/libsvn_client/conflicts-test.c
(test_merge_incoming_move_dir_with_moved_file): Remove obsolete 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=1765145&r1=1765144&r2=1765145&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Sun Oct 16
12:05:40 2016
@@ -3036,8 +3036,6 @@ test_merge_incoming_move_dir_with_moved_
SVN_ERR(svn_client_conflict_tree_get_details(conflict, ctx, pool));
- /* XFAIL: The conflict resolver doesn't find the move, and doesn't offer
- * the svn_client_conflict_option_incoming_move_file_text_merge option. */
{
svn_client_conflict_option_id_t expected_opts[] = {
svn_client_conflict_option_postpone,
