Add a test for a problem whereby a merge fails with the error "Inconsistent line ending style" if the source change consists of unifying the EOL style and then setting svn:eol-style=native.
Add a test for a problem whereby a merge fails with the error "Inconsistent
line ending style" if the source change consists of unifying the EOL style
and then setting svn:eol-style=native.

* subversion/tests/cmdline/merge_tests.py
  (svn_merge): Allow a revision specifier string as an alternative to a
    single revision number.
  (merge_an_eol_unification_and_set_svn_eol_style): New test function.
  (test_list): Add the new test.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@872981 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion