TortoiseSVN Conflict Resolver concats lines

Hey group,

Version Info:

TortoiseSVN 1.5.7, Build 15182 - 32 Bit , 2009/01/24 22:44:13
Subversion 1.5.5,
apr 1.2.12
apr-utils 1.2.12
berkeley db 4.4.20
neon 0.28.3
OpenSSL 0.9.8i 15 Sep 2008
zlib 1.2.3

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!

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1098544

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-03 22:18:20 CET