Following up on r918542, commit the fixed merge test.
Following up on r918542, commit the fixed merge test.

* subversion/tests/cmdline/merge_tests.py
  (merge_dir_and_file_replace): Don't assume that commit will show an Adding
    line for a file that is added via its parent.

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