Re: TortoiseMerge and old editors (CTRL-Z)

Bastiaan Veelo wrote:
> Hi,
>
> and thank you for TortoiseSVN!
> There is a bug in recent versions (running 1.4.3) that TortoiseSVN
> cannot diff a file if it contains a CTRL-Z marker at the end of the
> file. You get the message "Cannot show diff because of inconsistent
> newlines in the file". Command line clients, both native and from
> Cygwin, do not have this problem.
>
> We have users who use editors that automatically add this marker, so
> this is a serious limitation for them.
>
> There is a small thread about this:
> http://svn.haxx.se/tsvnusers/archive-2007-01/0159.shtml

That should work now with the latest version from trunk. If you like,
you can try it out and report back if you find any more issues with that
version.

Stefan

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