* subversion/svn/conflict-callbacks.c   (svn_cl__conflict_handler): Use pool, not subpool, in the --accept     handling section.
* subversion/svn/conflict-callbacks.c
  (svn_cl__conflict_handler): Use pool, not subpool, in the --accept
    handling section.

Found by: pburba


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

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