* subversion/libsvn_wc/merge.c   (eval_conflict_func_result): Rename pool to scratch_pool, no functional    change.
* subversion/libsvn_wc/merge.c
  (eval_conflict_func_result): Rename pool to scratch_pool, no functional
   change.

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