Add another regression test for the conflict resolver. This tests the 'R' option in the file add vs file add upon update case. * subversion/tests/libsvn_client/conflicts-test.c (test_update_incoming_added_file_replace, test_funcs): New test.
subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c