For issue #4874 "Avoid foreign repository merge if repository UUIDs match"

Automatically change the test's expectations from a warning to an error when
Subversion 1.16 comes out.

* subversion/tests/cmdline/merge_tests.py
  (merge_error_if_ambiguous_foreign_merge): Make expectations conditional on
    the Subversion client version.


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