* 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: https://svn.apache.org/repos/asf/subversion/trunk@1438282 13f79535-47bb-0310-9956-ffa450edef68