Merging two branches

      I have a mixed c,c++ and java source files in two different branches. I
have done a checkout from one branch, then I have used svn merge
svn://other/branch, but when the svn client discovers a conflict between
different versions of the same file (for example a java file) the entire file
content is marked as different even if in reality only several lines differ.
      This issue is annoying when the file is large and one needs only to see
the lines where the two file versions differ. Is there a way to solve this
issue?
regards

-- 
Bogdan Cristea
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org