Fix test.
Fix test.

* subversion/tests/cmdline/merge_tests.py
  (merge_eolstyle_handling); fix expected statuses and include merge property
   updates

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