* subversion/libsvn_client/patch.c   (merge_hunk): If a hunk had a merge conflict, don't allow any    subsequent non-conflicting hunks to clear the conflicted status.
* subversion/libsvn_client/patch.c
  (merge_hunk): If a hunk had a merge conflict, don't allow any
   subsequent non-conflicting hunks to clear the conflicted status.


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

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