Tweak an XFailing merge test to reflect expected issue #3642 behavior.
Tweak an XFailing merge test to reflect expected issue #3642 behavior.

* subversion/tests/cmdline/merge_tests.py

  (merge_target_with_non_inheritable_mergeinfo): During a depth=immediates
   merge, immediate directory children of the merge target should get
   non-inheritable mergeinfo describing the merge *if* a depth=infinity
   merge would have affected that child.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion