Add a test for issue #3989 'merge which deletes file with native eol-style raises spurious tree conflict'.
Add a test for issue #3989 'merge which deletes file with native
eol-style raises spurious tree conflict'.

* subversion/tests/cmdline/merge_tests.py

  (merged_deletion_causes_tree_conflict): New.

  (test_list): Add merged_deletion_causes_tree_conflict.

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