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

Re: [TSVN] Request: TortoiseMerge, color settings

From: SteveKing <stefankueng_at_gmail.com>
Date: 2005-07-19 11:42:55 CEST

On 7/19/05, Simon Large <simon@skirridsystems.co.uk> wrote:
> >>But when are those colours used? If there is a change in a line, then it
> >>gets shown as added/deleted. If you ignore whitespace in the compare,
> >>the difference is not shown at all. Or are you looking at the line diff bar?
> >
> > If there's a change in a line only in whitespace (and ignore
> > whitespace is turned off), then (in two pane view) the whitespace
> > diffs are shown 'in line' with that color.
>
> I don't see that here. See screenshots.

Activate "ignore leading whitespaces", then use the files Bearbeiten1
and Bearbeiten2 in the 'test' Subfolder of TortoiseMerge
(/trunk/src/TortoiseMerge/test/Bearbeiten1, ...) and open those files.

Then it will look like attached screenshot:

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

tmerge.png
Received on Tue Jul 19 11:43:16 2005

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.