| commit | 8eb45d2de4752ca07b65aeef3992f16cb8d79f34 | [log] [tgz] |
|---|---|---|
| author | Stefan Sperling <stsp@apache.org> | Wed Jul 06 11:58:34 2016 +0000 |
| committer | Stefan Sperling <stsp@apache.org> | Wed Jul 06 11:58:34 2016 +0000 |
| tree | b5789334afd17eb5d1c9ace24bb06d01fa976833 | |
| parent | 537005b3c452b33b13fe513f097e849d952684c3 [diff] |
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. git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1751664 13f79535-47bb-0310-9956-ffa450edef68