[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[TSVN] TortoiseMerge - Line Break Issue

From: Brendan van Drempt <Brendan_vanDrempt_at_scholastic.com.au>
Date: 2005-02-15 00:34:36 CET

I'm wondering if anyone can shed some light on an issue I have using
TortoiseMerge

When I attempt to resolve a conflict or do a diff... All the code is
appearing on one line... which is very frustrating as you can not choose
actual lines of code from "yours" or "theirs" and renders the application
useless.

I have looked in the settings but can not find anything to resolve this.
Development Tools being used to edit code include VisualStudio.net,
Dreamweaver & Textpad.

TortoiseMerge 1.1.0, Build 1694, MBCS

Regards,

Brendan.

#######################################################################
Attention:
This communication may contain CONFIDENTIAL or copyright information
of Scholastic Australia. If you are not an intended recipient, you MUST
NOT keep, forward, copy, use, save or rely on this communication, and
any such action is unauthorised and prohibited. If you have received
this communication in error, please reply to this email to notify the
sender of its incorrect delivery, and then delete both it and your
reply.
Thank You

This e-mail message has been scanned for Viruses and Content and
cleared by NetIQ MailMarshal
#######################################################################
Received on Tue Feb 15 00:32:13 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.