Re: [TSVN] TortoiseMerge - Line Break Issue

On Tue, 15 Feb 2005 10:34:36 +1100, Brendan van Drempt
<Brendan_vanDrempt@scholastic.com.au> wrote:
> 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.

Check your file(s) with a hex editor. You'll find that you're using
the MAC lineending style (one CR) which isn't supported (even newer
Mac's don't use that lineending style anymore!).

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org