* subversion/svn/file-merge.c   (merge_chunks): Use a colon to terminate the "Conflicting section found    during merge" message, instead of a full stop.
* subversion/svn/file-merge.c
  (merge_chunks): Use a colon to terminate the "Conflicting section found
   during merge" message, instead of a full stop.


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion