Add a dose of common sense to test for issue #4306 'multiple editor drive
file merges record wrong mergeinfo during conflicts'

* subversion/tests/cmdline/merge_tests.py

  (conflict_aborted_mergeinfo_described_partial_merge): Add line endings
   as we append text to a file.  This doesn't actually effect the test,
   but makes it a bit easy to follow if one is playing around with the
   resulting WC.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1441556 13f79535-47bb-0310-9956-ffa450edef68