Fix some incorrect expectations for XFailing merge test for issue #2690.
Fix some incorrect expectations for XFailing merge test for issue #2690.

* subversion/tests/cmdline/merge_tests.py
  (merge_dir_and_file_replace): Account for mergeinfo and correct expected
  output from a merge.  This test still fails, but now fails as described
  in issue #2690.

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