* tests/libsvn/fs-test.c
* tests/libsvn/fs-test.c

  (attempt_merge, merge_trees): Removed obsolete functions.

  (unexpected_node_id): New helper function.

  (merge_re_id): New test function.

  (merging_commit): Kick up the filesize to 100,000 bytes, and drop
  the number of commits from 100 to 10.

  (test_funcs): Removed reference to merge_trees(), add reference to
  merge_re_id().

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