* subversion/tests/cmdline/merge_reintegrate_tests.py
  (reintegrate_fail_on_modified_wc, reintegrate_fail_on_switched_wc):
    Tweak the scenarios so that the 'reintegrate' style of merge is really
    necessary, so that an 'automatic' merge would operate in the same way,
    in preparation for also testing these scenarios with automatic merge.

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