* notes/wc-ng/conflict-store:   (): some changes to how patch rejects are recorded
* notes/wc-ng/conflict-store:
  (): some changes to how patch rejects are recorded


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

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