* 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

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion