Fix issue #1769: allow merge to add directory, even if 'deleted'.
Fix issue #1769: allow merge to add directory, even if 'deleted'.

Patch by: S. Ramaswamy <ramaswamy@collab.net>

* subversion/libsvn_client/diff.c
  (merge_dir_added) : Change 'show_hidden' to FALSE to prevent 'entry'
    from being returned when directory is 'deleted', and allow svn merge
    to continue.

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