Revision 1878997

Add a test for issue #4859: Merge removing a folder with non-inheritable
mergeinfo.

The merge fails like this:
> svn merge -c4 ^/branch_A .../A
> --- Merging r4 into '.../A':
> D    .../A/D
> svn: E155023: Can't set properties on '/.../A/D/gamma':
> invalid status for updating properties.

* subversion/tests/cmdline/merge_tests.py
  (merge_deleted_folder_with_mergeinfo): New test.
  (test_list): Run it.