Followup to r18716: Add an extra test to validate that svn merge ignores  eolstyle when requested (-x --ignore-eol-style option). 
Followup to r18716: Add an extra test to validate that svn merge ignores 
eolstyle when requested (-x --ignore-eol-style option). 

* subversion/tests/cmdline/merge_tests.py
  (merge_ignore_eolstyle): New test
  (test_list): Run the new merge test.

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