Fix an auto-merge regression (though one probably never seen in production) I inadvertantly introduced in r15569.
Fix an auto-merge regression (though one probably never seen in
production) I inadvertantly introduced in r15569.

* subversion/libsvn_fs_base/tree.c
  (merge): Since svn_fs_base__dag_dir_entries() doesn't actually
    populate the 'kind' field of the svn_fs_dirent_t object it
    returns, revert to using svn_fs_base__dag_node_kind() to check
    path kinds.

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