Re: TortoiseSVN Conflict Resolver concats lines

babzog wrote:

> Using TortoiseMerge.
>
> When I am finished editing conflicts in a code file, I then save and
> resolve the conflict from the tortoisemerge gui. If I then look at
> the file in Visual Studio or notepad++, the code block that I selected
> during the conflict resolution process is all concatenated onto one
> line. This is extremely annoying since I have to then spend time
> either C&P from ViewVC to my code file, or spend the time to put all
> the code back where it should be. Especially annoying with XML files.
>
> Hope there's a simple solution to this!

That's already fixed and merged back to the 1.5.x branch. But not
released yet. You can use a nightly build if you like.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1098678
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].