tree d90a98dd98bb23aa187bf0ad109c0d2ee4b55ef1
parent cc8c65ba38d92126fbac26b857455ccc79503bf3
author Stefan Sperling <stsp@apache.org> 1469460947 +0000
committer Stefan Sperling <stsp@apache.org> 1469460947 +0000

Add a test for the resolver bug fixed by r1751893.

* subversion/tests/libsvn_client/conflicts-test.c
  (create_wc_with_incoming_delete_vs_local_delete): New helper function.
  (test_merge_incoming_delete_vs_local_delete, test_func): New test.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1754030 13f79535-47bb-0310-9956-ffa450edef68