Follow up r22510: update the testcase to check for the added 'eol' in the conflict description in the '.prej' files.
Follow up r22510: update the testcase to check for the added 'eol' in the
conflict description in the '.prej' files.

* subversion/tests/cmdline/merge_tests.py
  (simple_property_merges): 
   Append '\n' to expected '*.prej' contents.

Patch by: Kamesh Jayachandran <kamesh@collab.net>
(Tweaked by me).

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

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