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

Re: [TSVN] TortoisMerge does not show missing newline at the end of file

From: Johan Appelgren <johan.appelgren_at_gmail.com>
Date: 2005-08-26 10:27:03 CEST

On 8/26/05, Klaus Drechsler <drechsler@gmx.net> wrote:
> Hi,
>
> TortoiseMerge does not show that one file is missing a new line at the end
> of the file.
>
> The unified diff shows this:
>
> @@ -106,4 +106,4 @@
> }
>
> return (ret>>ADC_AVERAGE_COUNTER_EXPONENT);
> -}
> \ No newline at end of file
> +}
>
>
> In TortoiseMerge both sides seem to be identical (nothing is marked).
>
> Greetings,
> Klaus
>

Might be because the "Ignore Lineendings" option is active? See
http://tortoisesvn.sourceforge.net/docs/release/TortoiseMerge_en/help-onepage.html#tmerge-ch-2-sect-4

/Johan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Aug 26 10:27:25 2005

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