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

Re: TortoiseMerge Help

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2006-09-27 22:44:06 CEST

Stefan Küng wrote:
> Simon Large wrote:
>> Stefan Küng wrote:
>>> Oto BREZINA wrote:
>>>> in TortoiseMerge: /<guilabel>Ignore Leading Whitespaces</guilabel>
>>>> hides changes which are due solely to leading whitespace
>>>> (indentation). Other whitespace changes within a line are shown
>>>> <quote>inline</quote> rather than as added/removed lines./
>>>> I don't found/identify corensponding in Tortoise. Instead I found
>>>> this. I'm not sure about meaning (differences) of 2 and 3
>>>> * &Compare whitespaces
>>>> * &Ignore whitespace changes
>>>> * Ignore &all whitespaces
>>> Yes, the docs need to be adjusted here.
>> You're right, but I don't know the difference between 2 and 3 either ;-)
> "Ignore whitespace changes": ignores changes in a sequence of whitespace
> chars, i.e. treats a sequence of whitespace chars as one whitespace char.
> Example:
> this<space><tab>is a text
> this<tab><space><tab>is a text
> will be considered as equal, but
> <tab>this<space><tab>is a text
> this<space><tab>is a text
> will be considered different.
> "Ignore all whitespaces": ignores all whitespace changes
> In the example above, the second two lines would be considered equal too.

OK, I will put that in.

Another one for you: Colour code in-line changes. I tried that just now
and I can't see any difference. Using r7496-dev.


   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
Received on Wed Sep 27 22:43:50 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.