On the issue-3668-3669 branch: One final test tweak.
On the issue-3668-3669 branch: One final test tweak.

* subversion/tests/cmdline/merge_tests.py

  (merge_target_and_subtrees_need_nonintersecting_ranges): Manually propset
   some mergeinfo in this test's setup to mimic pre-1.7 behavior, see
   http://subversion.tigris.org/issues/show_bug.cgi?id=3669#desc8


git-svn-id: 68647d3f2261a7d8b3bb2bef0a81bb63d4e45f4f@1035704 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion