* subversion/tests/cmdline/merge_tests.py   (merge_properties_on_adds): Add regression test for a strange open issue I     found today while tweaking the diff and merge handling.
* subversion/tests/cmdline/merge_tests.py
  (merge_properties_on_adds): Add regression test for a strange open issue I
    found today while tweaking the diff and merge handling.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1438282 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion