The same file in the trunk has the text:
When I do the merge from the branch to the trunk, the file in the trunk gets completely overwritten with (which is the content of the branch file):
and there are no conflicts reported, but there definetely are conflicts with lines 2 and 3.
I do the merge like this:
svn merge http://<url of trunk> http://<url of branch> <working copy of trunk>
I expected .diff and .original .working files to be created by svn merge, but none where. Please help if you may, I would really appreciate it.