Andrey Roussev created SVN-4632:
-----------------------------------
Summary: Conflict on merging eol-syle:native property change only
Key: SVN-4632
URL: https://issues.apache.org/jira/browse/SVN-4632
Project: Subversion
Issue Type: Bug
Reporter: Andrey Roussev
* make a branch from trunk
* add eol-style:native attribute to some file in trunk
* merge that changes into branch
* in subversion 1.8.x, 1.9.x you will get a conflict, in subversion 1.7.x you
will not
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
