Make a merge test fail for the right reason.
Make a merge test fail for the right reason.

* subversion/tests/cmdline/merge_tests.py
  (merge_target_with_non_inheritable_mergeinfo): Don't expect natural history
  to be present in explicit mergeinfo.

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