Improve formatting of dir_conflicts.prej files, which were missing a trailing newline.
Improve formatting of dir_conflicts.prej files, which were missing a
trailing newline.

* subversion/libsvn_wc/props.c
  (append_prop_conflict): Write a trailing end of line sequence after
   CONFLICT_DESCRIPTION.  Adjust doc string accordingly.


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

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