Fix issue 705.  Don't use the trail pool for the returned conflict path.
Fix issue 705.  Don't use the trail pool for the returned conflict path.

* subversion/libsvn_fs/tree.c
  (merge): Change parameter to svn_stringbuf_t*, and set it using
  svn_stringbuf_set.
  (merge_args): Make conflict an svn_stringbuf_t*.
  (svn_fs_commit_txn, svn_fs_merge_txn): Initialise merge_args.conflict
  using svn_stringbuf_create.

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